theme fix

Filter connections in quick connect.
Need more custom CSS to handle long connection list.
See also #403

.eslintrc.yml

@@ -0,0 +1,55 @@
+parser: babel-eslint
+extends: standard
+env:
+  node: true
+  commonjs: true
+rules:
+  no-duplicate-imports: error
+  import/no-duplicates: 0
+  array-bracket-spacing:
+  - error
+  - never
+  block-scoped-var: error
+  brace-style:
+  - error
+  - 1tbs
+  computed-property-spacing:
+  - error
+  - never
+  comma-dangle:
+  - error
+  - always-multiline
+  curly: error
+  eol-last: error
+  eqeqeq:
+  - error
+  - smart
+  max-depth:
+  - 1
+  - 5
+  max-statements:
+  - 1
+  - 80
+  no-multiple-empty-lines: error
+  no-mixed-spaces-and-tabs: error
+  no-trailing-spaces: error
+  no-unused-vars:
+    - error
+    - vars: all
+      args: after-used
+      argsIgnorePattern: ^_
+  no-undef: error
+  no-use-before-define:
+  - error
+  - nofunc
+  no-var: error
+  object-curly-spacing:
+  - error
+  - always
+  quote-props:
+  - warn
+  - as-needed
+  - keywords: true
+    numbers: true
+  strict:
+  - error

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "T: Enhancement"
+  - "S: Triaged"
+# Label to use when marking an issue as stale
+staleLabel: "S: Stale"
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed in two weeks unless you comment.
+
+  Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -16,3 +16,4 @@ npm-debug.log
 
 builtin-plugins
 package-lock.json
+yarn-error.log

.pug-lintrc.js

@@ -0,0 +1,2 @@
+module.export = {
+}

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     env: BUILD_FOR=macos
 
 language: node_js
-node_js: 7
+node_js: 8
 
 cache:
   directories:
@@ -30,8 +30,6 @@ addons:
   apt:
     packages:
     - rpm
-    - wine
-    - mono-runtime
     - yarn
     sources:
     - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'

README.md

@@ -1,33 +1,21 @@
-<div align="center">
-    <img src="https://raw.githubusercontent.com/Eugeny/terminus/master/build/icons/128x128.png">
-    <h1>Terminus α</h1>
-    <p>
-        <i>A terminal for a more modern age</i>
-    </p>
-    <br/>
-    <br/>
-    <br/>
-</div>
+![](https://github.com/Eugeny/terminus/raw/master/docs/readme.png)
+
 
 [![Build Status](https://travis-ci.org/Eugeny/terminus.svg?branch=master)](https://travis-ci.org/Eugeny/terminus) [![Build status](https://ci.appveyor.com/api/projects/status/wnnq4hm5mbd9rgoy?svg=true)](https://ci.appveyor.com/project/Eugeny/terminus) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE) [![Downloads](https://img.shields.io/badge/downloads-latest_release-brightgreen.svg)](https://github.com/Eugeny/terminus/releases/latest)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_shield)
 
 ----
 
-![](https://github.com/Eugeny/terminus/raw/master/docs/linux.png)
-
-**Terminus** is a web technology based terminal heavily inspired by Hyper. It is, however, designed for people who need to get things done.
+**Terminus** is a terminal heavily inspired by Hyper. It is, however, designed for people who need to get things done.
 
   * Runs on Windows, macOS and Linux
   * Theming and color schemes
-  * Configurable hotkey schemes
-  * **GNU Screen** style hotkeys available by default
+  * Fully configurable shortcuts
   * Full Unicode support including double-width characters
   * Doesn't choke on fast-flowing outputs
+  * Proper shell-like experience on Windows including tab completion (via Clink)
+  * CMD, PowerShell, PowerShell Core, Cygwin, Cmder, Git-Bash and WSL (Bash on Windows) support
   * Tab persistence on macOS and Linux
-  * Proper shell-like experience on Windows including tab completion (thanks, Clink!)
-  * CMD, PowerShell, Cygwin, Git-Bash and Bash on Windows support
-  * Default Linux style hotkeys for copy (`Ctrl`+`Shift`+`C`) and paste (`Ctrl`+`Shift`+`V`)
 
 ---
 
@@ -38,15 +26,17 @@ Plugins can be installed directly from the Settings view inside Terminus.
   * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
   * [theme-hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme
   * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
+  * [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
+  * [scrollbar](https://github.com/kbjr/terminus-scrollbar) - adds a scrollbar to terminal tabs
 
 ---
 
 # Contributing
 
-Pull requests and plugins are welcome! Publish your plugin on NPM with a `terminus-plugin` keyword to make them appear in the Plugin Manager.
+Pull requests and plugins are welcome! Publish your plugin on NPM with a `terminus-plugin` keyword to make it appear in the Plugin Manager.
 
 See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for a very brief plugin development tutorial!
 
 
 ## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)

app/index.pug

@@ -9,7 +9,9 @@ html
         script(src='./preload.js')
         script(src='./bundle.js', defer)
         style#custom-css
-    body(style='background: ; min-height: 100vh; overflow: hidden')
+        style.
+            body { transition: 0.5s background; }
+    body
         app-root
             .preload-logo
                 div

app/lib/app.ts

@@ -0,0 +1,171 @@
+import { app, ipcMain, Menu, Tray, shell } from 'electron'
+import { Window } from './window'
+
+export class Application {
+    private tray: Tray
+    private windows: Window[] = []
+
+    constructor () {
+        ipcMain.on('app:config-change', () => {
+            this.broadcast('host:config-change')
+        })
+    }
+
+    async newWindow (): Promise<Window> {
+        let window = new Window()
+        this.windows.push(window)
+        window.visible$.subscribe(visible => {
+            if (visible) {
+                this.disableTray()
+            } else {
+                this.enableTray()
+            }
+        })
+        this.setupMenu()
+        await window.ready
+        return window
+    }
+
+    broadcast (event, ...args) {
+        for (let window of this.windows) {
+            window.send(event, ...args)
+        }
+    }
+
+    async send (event, ...args) {
+        if (!this.hasWindows()) {
+            await this.newWindow()
+        }
+        this.windows[0].send(event, ...args)
+    }
+
+    enableTray () {
+        if (this.tray) {
+            return
+        }
+        if (process.platform === 'darwin') {
+            this.tray = new Tray(`${app.getAppPath()}/assets/tray-darwinTemplate.png`)
+            this.tray.setPressedImage(`${app.getAppPath()}/assets/tray-darwinHighlightTemplate.png`)
+        } else {
+            this.tray = new Tray(`${app.getAppPath()}/assets/tray.png`)
+        }
+
+        this.tray.on('click', () => this.focus())
+
+        const contextMenu = Menu.buildFromTemplate([{
+            label: 'Show',
+            click: () => this.focus(),
+        }])
+
+        if (process.platform !== 'darwin') {
+            this.tray.setContextMenu(contextMenu)
+        }
+
+        this.tray.setToolTip(`Terminus ${app.getVersion()}`)
+    }
+
+    disableTray () {
+        if (this.tray) {
+            this.tray.destroy()
+            this.tray = null
+        }
+    }
+
+    hasWindows () {
+        return !!this.windows.length
+    }
+
+    focus () {
+        for (let window of this.windows) {
+            window.show()
+            window.focus()
+        }
+    }
+
+    private setupMenu () {
+        let template: Electron.MenuItemConstructorOptions[] = [
+            {
+                label: 'Application',
+                submenu: [
+                    { role: 'about', label: 'About Terminus' },
+                    { type: 'separator' },
+                    {
+                        label: 'Preferences',
+                        accelerator: 'Cmd+,',
+                        async click () {
+                            if (!this.hasWindows()) {
+                                await this.newWindow()
+                            }
+                            this.windows[0].send('host:preferences-menu')
+                        },
+                    },
+                    { type: 'separator' },
+                    { role: 'services', submenu: [] },
+                    { type: 'separator' },
+                    { role: 'hide' },
+                    { role: 'hideothers' },
+                    { role: 'unhide' },
+                    { type: 'separator' },
+                    {
+                        label: 'Quit',
+                        accelerator: 'Cmd+Q',
+                        click () {
+                            app.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: [
+                    { role: 'reload' },
+                    { role: 'forcereload' },
+                    { role: 'toggledevtools' },
+                    { type: 'separator' },
+                    { role: 'resetzoom' },
+                    { role: 'zoomin' },
+                    { role: 'zoomout' },
+                    { type: 'separator' },
+                    { role: 'togglefullscreen' },
+                ],
+            },
+            {
+                role: 'window',
+                submenu: [
+                    { role: 'minimize' },
+                    { role: 'close' },
+                    { role: 'zoom' },
+                    { type: 'separator' },
+                    { role: 'front' },
+                ],
+            },
+            {
+                role: 'help',
+                submenu: [
+                    {
+                        label: 'Website',
+                        click () {
+                            shell.openExternal('https://eugeny.github.io/terminus')
+                        },
+                    },
+                ],
+            }
+        ]
+
+        Menu.setApplicationMenu(Menu.buildFromTemplate(template))
+    }
+}

app/lib/cli.ts

@@ -0,0 +1,23 @@
+import { app } from 'electron'
+
+export function parseArgs (argv, cwd) {
+    if (argv[0].includes('node')) {
+        argv = argv.slice(1)
+    }
+
+    return require('yargs')
+        .usage('terminus [command] [arguments]')
+        .command('open [directory]', 'open a shell in a directory', {
+            directory: { type: 'string', 'default': cwd },
+        })
+        .command('run [command...]', 'run a command in the terminal', {
+            command: { type: 'string' },
+        })
+        .version('v', 'Show version and exit', app.getVersion())
+        .alias('d', 'debug')
+        .describe('d', 'Show DevTools on start')
+        .alias('h', 'help')
+        .help('h')
+        .strict()
+        .parse(argv.slice(1))
+}

app/lib/index.ts

@@ -0,0 +1,61 @@
+import './lru'
+import { app, ipcMain, Menu } from 'electron'
+import electronDebug = require('electron-debug')
+import { parseArgs } from './cli'
+import { Application } from './app'
+if (process.platform === 'win32' && require('electron-squirrel-startup')) process.exit(0)
+
+if (!process.env.TERMINUS_PLUGINS) {
+    process.env.TERMINUS_PLUGINS = ''
+}
+
+const application = new Application()
+
+app.commandLine.appendSwitch('disable-http-cache')
+
+ipcMain.on('app:new-window', () => {
+    console.log('new-window')
+    application.newWindow()
+})
+
+app.on('activate', () => {
+    if (!application.hasWindows()) {
+        application.newWindow()
+    } else {
+        application.focus()
+    }
+})
+
+process.on('uncaughtException' as any, err => {
+    console.log(err)
+    application.broadcast('uncaughtException', err)
+})
+
+app.on('second-instance', (_event, argv, cwd) => {
+    application.send('host:second-instance', parseArgs(argv, cwd))
+})
+
+const argv = parseArgs(process.argv, process.cwd())
+
+if (!app.requestSingleInstanceLock()) {
+    app.quit()
+    process.exit(0)
+}
+
+if (argv.d) {
+    electronDebug({ enabled: true, showDevTools: 'undocked' })
+}
+
+app.on('ready', () => {
+    if (process.platform === 'darwin') {
+        app.dock.setMenu(Menu.buildFromTemplate([
+            {
+                label: 'New window',
+                click () {
+                    this.app.newWindow()
+                }
+            }
+        ]))
+    }
+    application.newWindow()
+})

app/lib/lru.ts

@@ -0,0 +1,15 @@
+let lru = require('lru-cache')({ max: 256, maxAge: 250 })
+
+let fs = require('fs')
+let origLstat = fs.realpathSync.bind(fs)
+
+// NB: The biggest offender of thrashing realpathSync is the node module system
+// itself, which we can't get into via any sane means.
+require('fs').realpathSync = function (p) {
+    let r = lru.get(p)
+    if (r) return r
+
+    r = origLstat(p)
+    lru.set(p, r)
+    return r
+}

app/lib/window.ts

@@ -0,0 +1,173 @@
+import { Subject, Observable } from 'rxjs'
+import { BrowserWindow, app, ipcMain } from 'electron'
+import ElectronConfig = require('electron-config')
+import * as yaml from 'js-yaml'
+import * as fs from 'fs'
+import * as path from 'path'
+
+let electronVibrancy: any
+if (process.platform !== 'linux') {
+    electronVibrancy = require('electron-vibrancy')
+}
+
+export class Window {
+    ready: Promise<void>
+    private visible = new Subject<boolean>()
+    private window: BrowserWindow
+    private vibrancyViewID: number
+    private windowConfig: ElectronConfig
+
+    get visible$ (): Observable<boolean> { return this.visible }
+
+    constructor () {
+        let configPath = path.join(app.getPath('userData'), 'config.yaml')
+        let configData
+        if (fs.existsSync(configPath)) {
+            configData = yaml.safeLoad(fs.readFileSync(configPath, 'utf8'))
+        } else {
+            configData = {}
+        }
+
+        this.windowConfig = new ElectronConfig({ name: 'window' })
+
+        let options: Electron.BrowserWindowConstructorOptions = {
+            width: 800,
+            height: 600,
+            title: 'Terminus',
+            minWidth: 400,
+            minHeight: 300,
+            webPreferences: { webSecurity: false },
+            frame: false,
+            show: false,
+        }
+        Object.assign(options, this.windowConfig.get('windowBoundaries'))
+
+        if ((configData.appearance || {}).frame === 'native') {
+            options.frame = true
+        } else {
+            if (process.platform === 'darwin') {
+                options.titleBarStyle = 'hiddenInset'
+            }
+        }
+
+        if (process.platform === 'win32' && (configData.appearance || {}).vibrancy) {
+            options.transparent = true
+        }
+
+        if (process.platform === 'linux') {
+            options.backgroundColor = '#131d27'
+        }
+
+        this.window = new BrowserWindow(options)
+        this.window.once('ready-to-show', () => {
+            if (process.platform === 'darwin') {
+                this.window.setVibrancy('dark')
+            } else if (process.platform === 'win32' && (configData.appearance || {}).vibrancy) {
+                this.setVibrancy(true)
+            }
+            this.window.show()
+            this.window.focus()
+        })
+        this.window.loadURL(`file://${app.getAppPath()}/dist/index.html?${this.window.id}`, { extraHeaders: 'pragma: no-cache\n' })
+
+        if (process.platform !== 'darwin') {
+            this.window.setMenu(null)
+        }
+
+        this.setupWindowManagement()
+
+        this.ready = new Promise(resolve => {
+            const listener = event => {
+                if (event.sender === this.window.webContents) {
+                    ipcMain.removeListener('app:ready', listener)
+                    resolve()
+                }
+            }
+            ipcMain.on('app:ready', listener)
+        })
+    }
+
+    setVibrancy (enabled: boolean) {
+        if (enabled && !this.vibrancyViewID) {
+            this.vibrancyViewID = electronVibrancy.SetVibrancy(this.window, 0)
+        } else if (!enabled && this.vibrancyViewID) {
+            electronVibrancy.RemoveView(this.window, this.vibrancyViewID)
+            this.vibrancyViewID = null
+        }
+    }
+
+    show () {
+        this.window.show()
+    }
+
+    focus () {
+        this.window.focus()
+    }
+
+    send (event, ...args) {
+        this.window.webContents.send(event, ...args)
+    }
+
+    private setupWindowManagement () {
+        this.window.on('show', () => {
+            this.visible.next(true)
+            this.window.webContents.send('host:window-shown')
+        })
+
+        this.window.on('hide', () => {
+            this.visible.next(false)
+        })
+
+        this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen'))
+        this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen'))
+
+        this.window.on('close', () => {
+            this.windowConfig.set('windowBoundaries', this.window.getBounds())
+        })
+
+        this.window.on('closed', () => {
+            this.destroy()
+        })
+
+        ipcMain.on('window-focus', () => {
+            this.window.focus()
+        })
+
+        ipcMain.on('window-maximize', () => {
+            this.window.maximize()
+        })
+
+        ipcMain.on('window-unmaximize', () => {
+            this.window.unmaximize()
+        })
+
+        ipcMain.on('window-toggle-maximize', () => {
+            if (this.window.isMaximized()) {
+                this.window.unmaximize()
+            } else {
+                this.window.maximize()
+            }
+        })
+
+        ipcMain.on('window-minimize', () => {
+            this.window.minimize()
+        })
+
+        ipcMain.on('window-set-bounds', (_event, bounds) => {
+            this.window.setBounds(bounds)
+        })
+
+        ipcMain.on('window-set-always-on-top', (_event, flag) => {
+            this.window.setAlwaysOnTop(flag)
+        })
+
+        ipcMain.on('window-set-vibrancy', (_event, enabled) => {
+            this.setVibrancy(enabled)
+        })
+    }
+
+    private destroy () {
+        this.window = null
+        this.visible.complete()
+    }
+}

app/main.js

@@ -1,281 +0,0 @@
-if (process.platform == 'win32' && require('electron-squirrel-startup')) process.exit(0)
-
-const electron = require('electron')
-if (process.argv.indexOf('--debug') !== -1) {
-    require('electron-debug')({enabled: true, showDevTools: 'undocked'})
-}
-
-
-let app = electron.app
-
-let secondInstance = app.makeSingleInstance((argv, cwd) => {
-  app.window.webContents.send('host:second-instance', argv, cwd)
-})
-
-if (secondInstance) {
-  app.quit()
-  return
-}
-
-
-const yaml = require('js-yaml')
-const path = require('path')
-const fs = require('fs')
-const Config = require('electron-config')
-let windowConfig = new Config({name: 'window'})
-
-
-if (!process.env.TERMINUS_PLUGINS) {
-  process.env.TERMINUS_PLUGINS = ''
-}
-
-setupWindowManagement = () => {
-    app.window.on('show', () => {
-      app.window.webContents.send('host:window-shown')
-      if (app.tray) {
-        app.tray.destroy()
-        app.tray = null
-      }
-    })
-
-    app.window.on('hide', (e) => {
-      if (!app.tray) {
-        setupTray()
-      }
-    })
-
-    app.window.on('close', (e) => {
-        windowConfig.set('windowBoundaries', app.window.getBounds())
-    })
-
-    app.window.on('closed', () => {
-        app.window = null
-    })
-
-    electron.ipcMain.on('window-focus', () => {
-        app.window.focus()
-    })
-
-    electron.ipcMain.on('window-toggle-focus', () => {
-        if (app.window.isFocused()) {
-            app.window.minimize()
-        } else {
-            app.window.focus()
-        }
-    })
-
-    electron.ipcMain.on('window-maximize', () => {
-        app.window.maximize()
-    })
-
-    electron.ipcMain.on('window-unmaximize', () => {
-        app.window.unmaximize()
-    })
-
-    electron.ipcMain.on('window-toggle-maximize', () => {
-        if (app.window.isMaximized()) {
-            app.window.unmaximize()
-        } else {
-            app.window.maximize()
-        }
-    })
-
-    electron.ipcMain.on('window-minimize', () => {
-        app.window.minimize()
-    })
-
-    electron.ipcMain.on('window-set-bounds', (event, bounds) => {
-        app.window.setBounds(bounds)
-    })
-
-    electron.ipcMain.on('window-set-always-on-top', (event, flag) => {
-        app.window.setAlwaysOnTop(flag)
-    })
-}
-
-
-setupTray = () => {
-  if (process.platform == 'darwin') {
-    app.tray = new electron.Tray(`${app.getAppPath()}/assets/tray-darwinTemplate.png`)
-    app.tray.setPressedImage(`${app.getAppPath()}/assets/tray-darwinHighlightTemplate.png`)
-  } else {
-    app.tray = new electron.Tray(`${app.getAppPath()}/assets/tray.png`)
-  }
-
-  app.tray.on('click', () => {
-    app.window.show()
-    app.window.focus()
-  })
-
-  const contextMenu = electron.Menu.buildFromTemplate([{
-    label: 'Show',
-    click () {
-      app.window.show()
-      app.window.focus()
-    }
-  }])
-
-  if (process.platform != 'darwin') {
-    app.tray.setContextMenu(contextMenu)
-  }
-
-  app.tray.setToolTip(`Terminus ${app.getVersion()}`)
-}
-
-
-setupMenu = () => {
-    let template = [{
-        label: "Application",
-        submenu: [
-            { role: 'about', label: 'About Terminus' },
-            { type: 'separator' },
-            {
-                label: 'Preferences',
-                accelerator: 'Cmd+,',
-                click () {
-                    app.window.webContents.send('host:preferences-menu')
-                }
-            },
-            { type: 'separator' },
-            { role: 'services', submenu: [] },
-            { type: 'separator' },
-            { role: 'hide' },
-            { role: 'hideothers' },
-            { role: 'unhide' },
-            { type: 'separator' },
-            {
-                label: 'Quit',
-                accelerator: 'Cmd+Q',
-                click () {
-                    app.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: [
-            {role: 'reload'},
-            {role: 'forcereload'},
-            {role: 'toggledevtools'},
-            {type: 'separator'},
-            {role: 'resetzoom'},
-            {role: 'zoomin'},
-            {role: 'zoomout'},
-            {type: 'separator'},
-            {role: 'togglefullscreen'}
-        ]
-    },
-    {
-        role: 'window',
-        submenu: [
-            {role: 'close'},
-            {role: 'minimize'},
-            {role: 'zoom'},
-            {type: 'separator'},
-            {role: 'front'}
-        ]
-    },
-    {
-        role: 'help',
-        submenu: [
-            {
-                label: 'Website',
-                click () { electron.shell.openExternal('https://eugeny.github.io/terminus') }
-            }
-        ]
-    }]
-
-    electron.Menu.setApplicationMenu(electron.Menu.buildFromTemplate(template))
-}
-
-
-start = () => {
-    let t0 = Date.now()
-
-    let configPath = path.join(electron.app.getPath('userData'), 'config.yaml')
-    let configData
-    if (fs.existsSync(configPath)) {
-        configData = yaml.safeLoad(fs.readFileSync(configPath, 'utf8'))
-    } else {
-        configData = {}
-    }
-
-    let options = {
-        width: 800,
-        height: 600,
-        title: 'Terminus',
-        minWidth: 400,
-        minHeight: 300,
-        'web-preferences': {'web-security': false},
-        //- background to avoid the flash of unstyled window
-        backgroundColor: '#131d27',
-        frame: false,
-        //type: 'toolbar',
-    }
-    Object.assign(options, windowConfig.get('windowBoundaries'))
-
-    if ((configData.appearance || {}).frame == 'native') {
-        options.frame = true
-    } else {
-        if (process.platform == 'darwin') {
-            options.titleBarStyle = 'hidden-inset'
-        }
-    }
-
-    app.commandLine.appendSwitch('disable-http-cache')
-
-    app.window = new electron.BrowserWindow(options)
-    app.window.loadURL(`file://${app.getAppPath()}/dist/index.html`, {extraHeaders: "pragma: no-cache\n"})
-
-    if (process.platform != 'darwin') {
-        app.window.setMenu(null)
-    }
-
-    app.window.show()
-    app.window.focus()
-
-    setupWindowManagement()
-
-    if (process.platform == 'darwin') {
-      setupMenu()
-    } else {
-      app.window.setMenu(null)
-    }
-
-    console.info(`Host startup: ${Date.now() - t0}ms`)
-    t0 = Date.now()
-    electron.ipcMain.on('app:ready', () => {
-        console.info(`App startup: ${Date.now() - t0}ms`)
-    })
-}
-
-app.on('ready', start)
-
-app.on('activate', () => {
-    if (!app.window)
-        start()
-    else {
-        app.window.show()
-        app.window.focus()
-    }
-})
-
-process.on('uncaughtException', function(err) {
-    console.log(err)
-    app.window.webContents.send('uncaughtException', err)
-})

app/package.json

@@ -5,32 +5,34 @@
     "name": "Eugene Pankov",
     "email": "e@ajenti.org"
   },
-  "main": "main.js",
+  "main": "dist/main.js",
   "version": "1.0.0-alpha.1",
   "scripts": {
     "build": "webpack --progress --color --display-modules",
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "4.3.0",
-    "@angular/common": "4.3.0",
-    "@angular/compiler": "4.3.0",
-    "@angular/core": "4.3.0",
-    "@angular/forms": "4.3.0",
-    "@angular/platform-browser": "4.3.0",
-    "@angular/platform-browser-dynamic": "4.3.0",
-    "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.2",
+    "@angular/animations": "6.0.2",
+    "@angular/common": "6.0.2",
+    "@angular/compiler": "6.0.2",
+    "@angular/core": "6.0.2",
+    "@angular/forms": "6.0.2",
+    "@angular/platform-browser": "6.0.2",
+    "@angular/platform-browser-dynamic": "6.0.2",
+    "@ng-bootstrap/ng-bootstrap": "^2.0.0",
     "devtron": "1.4.0",
     "electron-config": "0.2.1",
-    "electron-debug": "^1.0.1",
+    "electron-debug": "^2.0.0",
     "electron-is-dev": "0.1.2",
     "electron-squirrel-startup": "^1.0.0",
+    "electron-vibrancy": "^0.1.3",
     "js-yaml": "3.8.2",
     "mz": "^2.6.0",
-    "ngx-toastr": "^8.0.0",
+    "ngx-toastr": "^8.7.3",
     "path": "0.12.7",
-    "rxjs": "5.3.0",
-    "zone.js": "0.8.12"
+    "rxjs": "^6.1.0",
+    "yargs": "^12.0.1",
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
     "@types/mz": "0.0.31"

app/src/entry.preload.ts

@@ -1,3 +1,4 @@
+import '../lib/lru'
 import 'source-sans-pro'
 import 'font-awesome/css/font-awesome.css'
 import 'ngx-toastr/toastr.css'
@@ -28,8 +29,8 @@ Raven.config(
     }
 )
 
-process.on('uncaughtException', (err) => {
-    Raven.captureException(err)
+process.on('uncaughtException' as any, (err) => {
+    Raven.captureException(err as any)
     console.error(err)
 })
 

app/src/entry.ts

@@ -3,6 +3,9 @@ import 'core-js/es7/reflect'
 import 'core-js/core/delay'
 import 'rxjs'
 
+import './global.scss'
+import './toastr.scss'
+
 // Always land on the start view
 location.hash = ''
 

app/src/global.scss

@@ -0,0 +1,87 @@
+body {
+    min-height: 100vh;
+    overflow: hidden;
+    background: #1D272D;
+}
+
+.modal-dialog, .modal-backdrop {
+  -webkit-app-region: no-drag;
+}
+
+[ngbradiogroup] input[type="radio"] {
+    display: none;
+}
+
+.form-line {
+    display: flex;
+    border-top: 1px solid rgba(0, 0, 0, 0.2);
+    align-items: center;
+    padding: 10px 0;
+    margin: 0;
+    min-height: 64px;
+
+    .header {
+        margin-right: auto;
+
+        .title {
+        }
+
+        .description {
+            font-size: 13px;
+            opacity: .5;
+        }
+    }
+
+    &>.form-control, &>.input-group {
+        width: 33%;
+    }
+}
+
+input[type=range] {
+    -webkit-appearance: none;
+    background: transparent;
+    outline: none;
+    padding: 0;
+
+    &:focus {
+        border-color: transparent;
+    }
+
+    @mixin thumb() {
+        -webkit-appearance: none;
+        display: block;
+        height: 12px;
+        width: 12px;
+        background: #aaa;
+        border-radius: 6px;
+        cursor: pointer;
+        margin-top: -4px;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.95);
+        transition: 0.25s background;
+
+        &:hover {
+            background: #777;
+        }
+
+        &:active {
+            background: #666;
+        }
+    }
+
+    &::-webkit-slider-thumb { @include thumb(); }
+    &::-moz-range-thumb  { @include thumb(); }
+    &::-ms-thumb  { @include thumb(); }
+    &::thumb { @include thumb(); }
+
+    @mixin track() {
+        height: 4px;
+        background: #111;
+        margin: 3px 0 0;
+        box-sizing: border-box;
+    }
+
+    &::-webkit-slider-runnable-track { @include track(); }
+    &:focus::-webkit-slider-runnable-track { @include track(); }
+    &::-moz-range-track { @include track(); }
+    &::-ms-track { @include track(); }
+}

app/src/plugins.ts

@@ -61,6 +61,7 @@ const builtinModules = [
     '@ng-bootstrap/ng-bootstrap',
     'ngx-toastr',
     'rxjs',
+    'rxjs/operators',
     'terminus-core',
     'terminus-settings',
     'terminus-terminal',

app/src/preload.scss

@@ -58,7 +58,3 @@
       color: #842fe0;
   }
 }
-
-.modal-dialog {
-  -webkit-app-region: no-drag;
-}

app/src/toastr.scss

@@ -0,0 +1,16 @@
+#toast-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .toast {
+    box-shadow: 0 1px 0 rgba(0,0,0,.25);
+    padding: 10px;
+    background-image: none;
+    width: auto;
+
+    &.toast-info {
+      background-color: #555;
+    }
+  }
+}

app/tsconfig.json

@@ -17,7 +17,7 @@
         "lib": [
            "dom",
            "es2015",
-           "es2015.iterable.ts",
+           "es2015.iterable",
            "es2017",
            "es7"
         ]

app/tsconfig.main.json

@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "baseUrl": "./lib",
+        "module": "commonjs",
+        "target": "es2017",
+        "declaration": false,
+        "noImplicitAny": false,
+        "removeComments": false,
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
+        "sourceMap": true,
+        "noUnusedParameters": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "noUnusedParameters": true,
+        "noUnusedLocals": true,
+        "lib": [
+           "dom",
+           "es2015",
+           "es2015.iterable",
+           "es2017",
+           "es7"
+        ]
+    },
+    "compileOnSave": false,
+    "exclude": [
+        "dist",
+        "node_modules",
+        "*/node_modules"
+    ]
+}

app/webpack.config.js

@@ -6,46 +6,53 @@ module.exports = {
   target: 'node',
   entry: {
     'index.ignore': 'file-loader?name=index.html!val-loader!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
-    'preload': path.resolve(__dirname, 'src/entry.preload.ts'),
-    'bundle': path.resolve(__dirname, 'src/entry.ts'),
+    preload: path.resolve(__dirname, 'src/entry.preload.ts'),
+    bundle: path.resolve(__dirname, 'src/entry.ts'),
   },
+  mode: process.env.DEV ? 'development' : 'production',
   context: __dirname,
   devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,
-    filename: '[name].js'
+    filename: '[name].js',
   },
   resolve: {
     modules: ['src/', 'node_modules', '../node_modules', 'assets/'].map(x => path.join(__dirname, x)),
     extensions: ['.ts', '.js'],
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.ts$/,
-        loader: 'awesome-typescript-loader',
-        options: {
-          configFileName: path.resolve(__dirname, 'tsconfig.json'),
-        }
+        use: {
+          loader: 'awesome-typescript-loader',
+          options: {
+            configFileName: path.resolve(__dirname, 'tsconfig.json'),
+          },
+        },
       },
       { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
       { test: /\.css$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
       {
         test: /\.(png|svg)$/,
-        loader: "file-loader",
-        options: {
-          name: 'images/[name].[ext]'
-        }
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'images/[name].[ext]',
+          },
+        },
       },
       {
         test: /\.(ttf|eot|otf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "file-loader",
-        options: {
-          name: 'fonts/[name].[ext]'
-        }
-      }
-    ]
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'fonts/[name].[ext]',
+          },
+        },
+      },
+    ],
   },
   externals: {
     '@angular/core': 'commonjs @angular/core',
@@ -55,14 +62,15 @@ module.exports = {
     '@angular/forms': 'commonjs @angular/forms',
     '@angular/common': 'commonjs @angular/common',
     '@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
-    'child_process': 'commonjs child_process',
-    'electron': 'commonjs electron',
+    child_process: 'commonjs child_process',
+    electron: 'commonjs electron',
     'electron-is-dev': 'commonjs electron-is-dev',
+    fs: 'commonjs fs',
     'ngx-toastr': 'commonjs ngx-toastr',
-    'module': 'commonjs module',
-    'mz': 'commonjs mz',
-    'path': 'commonjs path',
-    'rxjs': 'commonjs rxjs',
+    module: 'commonjs module',
+    mz: 'commonjs mz',
+    path: 'commonjs path',
+    rxjs: 'commonjs rxjs',
     'zone.js': 'commonjs zone.js/dist/zone.js',
   },
   plugins: [

app/webpack.main.config.js

@@ -0,0 +1,48 @@
+const path = require('path')
+const webpack = require('webpack')
+
+module.exports = {
+  name: 'terminus-main',
+  target: 'node',
+  entry: {
+    main: path.resolve(__dirname, 'lib/index.ts'),
+  },
+  mode: process.env.DEV ? 'development' : 'production',
+  context: __dirname,
+  devtool: 'source-map',
+  output: {
+    path: path.join(__dirname, 'dist'),
+    pathinfo: true,
+    filename: '[name].js',
+  },
+  resolve: {
+    modules: ['lib/', 'node_modules', '../node_modules'].map(x => path.join(__dirname, x)),
+    extensions: ['.ts', '.js'],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        use: {
+          loader: 'awesome-typescript-loader',
+          options: {
+            configFileName: path.resolve(__dirname, 'tsconfig.main.json'),
+          },
+        },
+      },
+    ],
+  },
+  externals: {
+    electron: 'commonjs electron',
+    'electron-config': 'commonjs electron-config',
+    'electron-vibrancy': 'commonjs electron-vibrancy',
+    'electron-squirrel-startup': 'commonjs electron-squirrel-startup',
+    fs: 'commonjs fs',
+    mz: 'commonjs mz',
+    path: 'commonjs path',
+    yargs: 'commonjs yargs',
+  },
+  plugins: [
+    new webpack.optimize.ModuleConcatenationPlugin(),
+  ],
+}

app/yarn.lock

@@ -2,51 +2,51 @@
 # yarn lockfile v1
 
 
-"@angular/animations@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.3.0.tgz#56f34b84649379202ac359929b82eb0b915e9c72"
+"@angular/animations@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.2.tgz#92063f612c3b33d962eddc9ad538cadd231fbe47"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/common@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.3.0.tgz#13a54a6929dd52f9729b16ae446fad58fe163053"
+"@angular/common@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.2.tgz#e4cbb7d45d8d2f35e918d62f0cbfd8c87e9168f7"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/compiler@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.3.0.tgz#55503bf27a1f062f71b9495393f3311903a8fc43"
+"@angular/compiler@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.2.tgz#b9d29b7e032c767179967540f1ed7f8777a615a1"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/core@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.3.0.tgz#bd2249c3de1224a7c6536c4aba728d6565329334"
+"@angular/core@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.2.tgz#d183730d73182a4590a5d71083db45655f210e69"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/forms@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.3.0.tgz#7d0c7a854737e9a30a5fd9665f8d4f56a1b91bd8"
+"@angular/forms@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.2.tgz#a0647930e8b6e7fbd48f55eb69b399a41bcd091a"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.0.tgz#551fb18851b27ee8f3e4b0ee25aad10bd7b312e3"
+"@angular/platform-browser-dynamic@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.2.tgz#755689df9f02bbcb270c7872a75a2ffe7e0b0c33"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/platform-browser@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.3.0.tgz#02389489185185c3becf06359346100e5479c7e1"
+"@angular/platform-browser@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.2.tgz#19f56f6efbd0e7af5f35fe2f8cde3557dc8ba689"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@ng-bootstrap/ng-bootstrap@^1.0.0-beta.2":
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-beta.2.tgz#3d4b567b0334a9ee631b73c72156cd3a9d3cd29f"
+"@ng-bootstrap/ng-bootstrap@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-2.0.0.tgz#65f78c7dd5a8ac424f44bb2050a9eab247cdeb0c"
 
 "@types/mz@0.0.31":
   version "0.0.31"
@@ -62,6 +62,14 @@ accessibility-developer-tools@^2.11.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
 
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -72,6 +80,26 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+bindings@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
 conf@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/conf/-/conf-0.11.2.tgz#879f479267600483e502583462ca4063fc9779b2"
@@ -81,12 +109,26 @@ conf@^0.11.1:
     mkdirp "^0.5.1"
     pkg-up "^1.0.0"
 
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 debug@^2.2.0, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  dependencies:
+    xregexp "4.0.0"
+
 devtron@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/devtron/-/devtron-1.4.0.tgz#b5e748bd6e95bbe70bfcc68aae6fe696119441e1"
@@ -107,27 +149,33 @@ electron-config@0.2.1:
   dependencies:
     conf "^0.11.1"
 
-electron-debug@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.2.0.tgz#22e51a73e1bf095d0bb51a6c3d97a203364c4222"
+electron-debug@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-2.0.0.tgz#3059a6557acbfb091f138d83875f57bac80cea6d"
   dependencies:
-    electron-is-dev "^0.1.0"
-    electron-localshortcut "^2.0.0"
+    electron-is-dev "^0.3.0"
+    electron-localshortcut "^3.0.0"
 
 electron-is-accelerator@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
 
-electron-is-dev@0.1.2, electron-is-dev@^0.1.0:
+electron-is-dev@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
 
-electron-localshortcut@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-2.0.2.tgz#6a1adcd6514c957328ec7912f5ccb5e1c10706db"
+electron-is-dev@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
+
+electron-localshortcut@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz#10c1ffd537b8d39170aaf6e1551341f7780dd2ce"
   dependencies:
     debug "^2.6.8"
     electron-is-accelerator "^0.1.0"
+    keyboardevent-from-electron-accelerator "^1.1.0"
+    keyboardevents-areequal "^0.2.1"
 
 electron-squirrel-startup@^1.0.0:
   version "1.0.0"
@@ -135,6 +183,13 @@ electron-squirrel-startup@^1.0.0:
   dependencies:
     debug "^2.2.0"
 
+electron-vibrancy@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/electron-vibrancy/-/electron-vibrancy-0.1.3.tgz#04382dd6e030e5ca5e60f8e024033738cb8479e3"
+  dependencies:
+    bindings "^1.2.1"
+    nan "^2.0.5"
+
 env-paths@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-0.3.1.tgz#c30ccfcbc30c890943dc08a85582517ef00da463"
@@ -143,6 +198,18 @@ esprima@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -150,6 +217,20 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
 highlight.js@^9.3.0:
   version "9.12.0"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
@@ -162,10 +243,32 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
 js-yaml@3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
@@ -173,6 +276,44 @@ js-yaml@3.8.2:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
+keyboardevent-from-electron-accelerator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-1.1.0.tgz#324614f6e33490c37ffc5be5876b3e85fe223c84"
+
+keyboardevents-areequal@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+lru-cache@^4.0.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -195,20 +336,72 @@ mz@^2.6.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-ngx-toastr@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-8.0.0.tgz#f3bc53146b2f7da3eabf3daa1b1bbdf65cb49697"
+nan@^2.0.5:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+ngx-toastr@^8.7.3:
+  version "8.7.3"
+  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-8.7.3.tgz#d3b7a8077ba1c860dd8a44779ccad38c5ea15c92"
+  dependencies:
+    tslib "^1.9.0"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
 path@0.12.7:
   version "0.12.7"
   resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
@@ -236,19 +429,76 @@ process@^0.11.1:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-rxjs@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.3.0.tgz#d88ccbdd46af290cbdb97d5d8055e52453fabe2d"
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+rxjs@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
   dependencies:
-    symbol-observable "^1.0.1"
+    tslib "^1.9.0"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-symbol-observable@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
 thenify-all@^1.0.0:
   version "1.6.0"
@@ -262,9 +512,9 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-tslib@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
+tslib@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.1.tgz#a5d1f0532a49221c87755cfcc89ca37197242ba7"
 
 util@^0.10.3:
   version "0.10.3"
@@ -272,6 +522,58 @@ util@^0.10.3:
   dependencies:
     inherits "2.0.1"
 
-zone.js@0.8.12:
-  version "0.8.12"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.12.tgz#86ff5053c98aec291a0bf4bbac501d694a05cfbb"
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  dependencies:
+    isexe "^2.0.0"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+
+"y18n@^3.2.1 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
+
+zone.js@~0.8.26:
+  version "0.8.26"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"

build/windows/icon.svg

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1024"
+   height="1024"
+   viewBox="0 0 270.93332 270.93333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="icon.svg"
+   inkscape:export-filename="D:\Users\Ich\Downloads\64x64.png"
+   inkscape:export-xdpi="6"
+   inkscape:export-ydpi="6">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35355339"
+     inkscape:cx="-57.249603"
+     inkscape:cy="781.4887"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1858"
+     inkscape:window-height="1050"
+     inkscape:window-x="54"
+     inkscape:window-y="1079"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     units="px" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-47.511065,70.941737)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path138"
+       style="opacity:0.9;fill:#bfd9f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.43524027px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 64.949149,-45.402272 213.30911,40.153203 168.74736,65.880709 64.949181,2.5692907 Z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path116"
+       style="opacity:0.9;fill:#6666af;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.43524027px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 301.0092,42.179959 -0.003,50.177506 -190.42255,107.635545 -0.003,-48.17143 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path118"
+       style="opacity:0.9;fill:#bfd9f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.43524027px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 64.948697,125.47711 45.629963,26.34447 0.005,48.17143 -45.637407,-26.50135 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.9;fill:#9dbef0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.44854069px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 105.39355,-70.939125 64.949149,-45.402272 213.30911,40.153203 64.948697,125.47711 110.57866,151.82158 260.4947,65.557719 301.0092,42.179959 Z"
+       id="path134"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>

docs/index.html

@@ -1,50 +1,4 @@
-<!DOCTYPE html><html><head><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400" rel="stylesheet"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link href="https://cdn.jsdelivr.net/g/bootstrap@4.0.0-alpha.6(css/bootstrap.min.css)" rel="stylesheet"><script src="https://cdn.jsdelivr.net/g/jquery@3.2.1,tether@1.4.0,bootstrap@4.0.0-alpha.6,modernizr@3.3.1,detectizr@2.2.0"></script><title>Terminus</title><style>body {
-    font-family: 'Source Sans Pro', sans-serif;
-    background: #111;
-    color: #ccc;
-    min-height: 100vh;
-    background-image: radial-gradient(#111, #000);
-}
-
-h1 {
-    font-size: 64px;
-}
-
-h1, h2, h3, h5 {
-    font-weight: 300;
-    color: white;
-}
-
-.btn i + span,
-.nav-link i + span {
-    margin-left: 10px;
-}
-
-.btn-outline-primary {
-    color: #b6e7ff !important;
-}
-
-.nav-link {
-    font-size: 22px;
-}
-
-video, img {
-    max-width: 100%;
-    box-shadow: 0 0 50px black;
-}
-</style><script defer>setTimeout(function () {
-    /*
-    if (Detectizr.os.name == 'windows') {
-        $('[href="#windows"]').tab('show')
-    }
-    if (Detectizr.os.name == 'mac os') {
-        $('[href="#macos"]').tab('show')
-    }
-    if (Detectizr.os.name == 'linux') {
-        $('[href="#linux"]').tab('show')
-    }
-    */
-})</script></head><body><div class="container mt-5 mb-5"><div class="text-center"><h1>Terminus</h1><h5>A terminal for a more modern age</h5><h2 class="text-muted">alpha</h2></div><div class="d-flex flex-row mt-5 mb-5"><ul class="nav nav-pills flex-column mr-5" style="min-width: 200px;"><li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#windows" role="tab"><i class="fa fa-windows"></i><span>Windows</span></a></li><li class="nav-item"><a class="nav-link" data-toggle="tab" href="#macos" role="tab"><i class="fa fa-apple"></i><span>macOS</span></a></li><li class="nav-item"><a class="nav-link" data-toggle="tab" href="#linux" role="tab"><i class="fa fa-linux"></i><span>Linux</span></a></li></ul><div class="tab-content"><div class="tab-pane active" id="windows" role="tabpanel"><div class="row"><div class="col-6"><video src="videos/windows.mp4" autoplay loop></video></div><div class="col-6"><h3>A proper Windows experience</h3><p> <b>Clink </b>provides tab completion, readline-style editing and persistent command history on Windows.</p><p>Also supported:<ul> <li>Classic CMD</li><li>PowerShell </li><li>Bash on Windows </li></ul></p></div></div></div><div class="tab-pane" id="macos" role="tabpanel"><div class="row"><div class="col-6"><!--video(src='videos/windows.mp4', autoplay, loop)--></div><div class="col-6"><h3>Well...</h3><p>Not much to say here, it just works.</p></div></div></div><div class="tab-pane" id="linux" role="tabpanel"><div class="row"><div class="col-6"><img src="linux.png"></div><div class="col-6"><p><ul> <li>Spawn with a global hotkey</li><li>Tabs persist after restart</li><li>Auto-dock to any side of any screen</li><li>Full Unicode and double-width character support</li></ul></p></div></div></div></div></div><div class="text-center"><div class="mt-3 mb-3"><h2></h2><div><div class="btn-group mt-3 mb-1"><a class="btn btn-lg btn-outline-success" href="https://github.com/Eugeny/terminus/releases/latest" target="_blank"><i class="fa fa-download"></i><span>Downloads</span></a><a class="btn btn-lg btn-outline-secondary" href="https://github.com/Eugeny/terminus" target="_blank"><i class="fa fa-github"></i><span>GitHub</span></a></div></div><small class="text-muted">EXE, DMG, DEB, RPM, TGZ</small></div></div><div class="row mt-5"><div class="col-6"><h3>User experience</h3><ul><li>Spawn and hide with a global hotkey</li><li>Fully customizable hotkey schema</li><li>Restores tabs </li><li>Drag in a file to paste the path</li><li>Click paths and URLs to open in browser/file manager</li><li>Keeps the current directory in new tabs</li></ul></div><div class="col-6"><div class="mb-5"><h3>Customizable</h3><p>Multiple app themes and a myriad of community color schemes for the terminal. Color scheme editor included.</p></div><div>       <h3>Infinitely extensible</h3><p>Install plugins from the NPM repository, or create your own with Typescript and Angular framework.</p></div></div></div></div><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+<!DOCTYPE html><html><head><base href="dist/"><meta name="viewport" content="initial-scale=1, minimal-ui, shrink-to-fit=no"><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400" rel="stylesheet"><script src="bundle.js"></script><title>Terminus</title></head><body><div class="mt-5 mb-5" id="header"><div class="text-center"><h1>Terminus</h1><div class="subtitle mb-3">A terminal for a more modern age</div><a class="btn btn-lg btn-outline-dark mt-4" href="https://github.com/Eugeny/terminus/releases/latest" target="_blank"><strong>DOWNLOAD</strong></a><a class="btn btn-lg btn-outline-secondary mt-4 ml-3" href="https://github.com/Eugeny/terminus" target="_blank"><strong>GITHUB</strong></a></div></div><div class="background-stripe"><div class="overlay overlay1"></div><div class="overlay overlay2"></div><div class="terminal"></div></div><div class="container mt-5 mb-5"><div class="d-flex flex-wrap flex-md-nowrap"><div class="w-100"><div class="feature">windows</div><div class="feature">linux</div><div class="feature">macos</div><br><div class="feature">powershell</div><div class="feature">wsl</div><div class="feature">cygwin</div><div class="feature">git-bash</div><div class="feature">cmder</div><div class="feature">clink</div></div><div class="w-100"><div class="feature">full unicode</div><div class="feature">global hotkey</div><div class="feature">plugins</div><div class="feature">tab recovery</div><div class="feature">custom css</div><div class="feature">themes</div><div class="feature">font ligatures</div><div class="feature">clickable paths</div><div class="feature">tabs on top/bottom</div><div class="feature">vibrancy</div><div class="feature">bracketed paste</div></div></div></div><div class="container mt-5 mb-5"><div class="text-center"><a class="btn btn-lg btn-outline-secondary mt-5" href="/terminus/#header"><strong>BEAM ME UP</strong></a></div></div><div class="background-stripe2"><div class="overlay overlay1"></div></div><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

docs/index.js

@@ -0,0 +1 @@
+import './styles.scss'

docs/index.pug

@@ -1,155 +1,64 @@
 doctype html
 html
     head
+        base(href='dist/')
+        meta(name='viewport', content='initial-scale=1, minimal-ui, shrink-to-fit=no')
         link(href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400", rel="stylesheet")
-        link(href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", rel="stylesheet")
-        link(href="https://cdn.jsdelivr.net/g/bootstrap@4.0.0-alpha.6(css/bootstrap.min.css)", rel="stylesheet")
-        script(src="https://cdn.jsdelivr.net/g/jquery@3.2.1,tether@1.4.0,bootstrap@4.0.0-alpha.6,modernizr@3.3.1,detectizr@2.2.0")
+        script(src='bundle.js')
         title Terminus
-        style.
-            body {
-                font-family: 'Source Sans Pro', sans-serif;
-                background: #111;
-                color: #ccc;
-                min-height: 100vh;
-                background-image: radial-gradient(#111, #000);
-            }
-            
-            h1 {
-                font-size: 64px;
-            }
-            
-            h1, h2, h3, h5 {
-                font-weight: 300;
-                color: white;
-            }
-            
-            .btn i + span,
-            .nav-link i + span {
-                margin-left: 10px;
-            }
-            
-            .btn-outline-primary {
-                color: #b6e7ff !important;
-            }
-            
-            .nav-link {
-                font-size: 22px;
-            }
-            
-            video, img {
-                max-width: 100%;
-                box-shadow: 0 0 50px black;
-            }
-        
-        script(defer).
-            setTimeout(function () {
-                /*
-                if (Detectizr.os.name == 'windows') {
-                    $('[href="#windows"]').tab('show')
-                }
-                if (Detectizr.os.name == 'mac os') {
-                    $('[href="#macos"]').tab('show')
-                }
-                if (Detectizr.os.name == 'linux') {
-                    $('[href="#linux"]').tab('show')
-                }
-                */
-            })
     body
-        .container.mt-5.mb-5
+        .mt-5.mb-5#header
             .text-center
                 h1 Terminus
-                h5 A terminal for a more modern age
-                h2.text-muted alpha
+                .subtitle.mb-3 A terminal for a more modern age
                 
-            .d-flex.flex-row.mt-5.mb-5
-                ul.nav.nav-pills.flex-column.mr-5(style='min-width: 200px')
-                    li.nav-item
-                        a.nav-link.active(data-toggle='tab', href='#windows', role='tab')
-                            i.fa.fa-windows
-                            span Windows
-                    li.nav-item
-                        a.nav-link(data-toggle='tab', href='#macos', role='tab')
-                            i.fa.fa-apple
-                            span macOS
-                    li.nav-item
-                        a.nav-link(data-toggle='tab', href='#linux', role='tab')
-                            i.fa.fa-linux
-                            span Linux
-
-                .tab-content
-                    #windows.tab-pane.active(role='tabpanel')
-                        .row
-                            .col-6
-                                video(src='videos/windows.mp4', autoplay, loop)
-                            .col-6
-                                h3 A proper Windows experience
-                                p 
-                                    b Clink 
-                                    | provides tab completion, readline-style editing and persistent command history on Windows.
-                                p Also supported:
-                                    ul 
-                                        li Classic CMD
-                                        li PowerShell 
-                                        li Bash on Windows 
-
-                    #macos.tab-pane(role='tabpanel')
-                        .row
-                            .col-6
-                                //video(src='videos/windows.mp4', autoplay, loop)
-                            .col-6
-                                h3 Well...
-                                p Not much to say here, it just works.
-
-                    #linux.tab-pane(role='tabpanel')
-                        .row
-                            .col-6
-                                img(src='linux.png')
-                            .col-6
-                                p
-                                    ul 
-                                        li Spawn with a global hotkey
-                                        li Tabs persist after restart
-                                        li Auto-dock to any side of any screen
-                                        li Full Unicode and double-width character support
+                a.btn.btn-lg.btn-outline-dark.mt-4(href='https://github.com/Eugeny/terminus/releases/latest', target='_blank')
+                    strong DOWNLOAD
 
+                a.btn.btn-lg.btn-outline-secondary.mt-4.ml-3(href='https://github.com/Eugeny/terminus', target='_blank')
+                    strong GITHUB
                     
+                
+        .background-stripe
+            .overlay.overlay1
+            .overlay.overlay2
+            .terminal
+
+        .container.mt-5.mb-5
+            .d-flex.flex-wrap.flex-md-nowrap
+                .w-100
+                    .feature windows
+                    .feature linux
+                    .feature macos
+                    br
+                    .feature powershell
+                    .feature wsl
+                    .feature cygwin
+                    .feature git-bash
+                    .feature cmder
+                    .feature clink
+                    
+                .w-100
+                    .feature full unicode
+                    .feature global hotkey
+                    .feature plugins
+                    .feature tab recovery
+                    .feature custom css
+                    .feature themes
+                    .feature font ligatures
+                    .feature clickable paths
+                    .feature tabs on top/bottom
+                    .feature vibrancy
+                    .feature bracketed paste
+                    
+        .container.mt-5.mb-5
             .text-center
-                .mt-3.mb-3
-                    h2
+                a.btn.btn-lg.btn-outline-secondary.mt-5(href='/terminus/#header')
+                    strong BEAM ME UP
 
-                    div
-                        .btn-group.mt-3.mb-1
-                            a.btn.btn-lg.btn-outline-success(href='https://github.com/Eugeny/terminus/releases/latest', target='_blank')
-                                i.fa.fa-download
-                                span Downloads
-                            a.btn.btn-lg.btn-outline-secondary(href='https://github.com/Eugeny/terminus', target='_blank')
-                                i.fa.fa-github
-                                span GitHub
-                    small.text-muted EXE, DMG, DEB, RPM, TGZ
-
-                        
-            .row.mt-5
-                .col-6
-                    h3 User experience
-                    ul
-                        li Spawn and hide with a global hotkey
-                        li Fully customizable hotkey schema
-                        li Restores tabs 
-                        li Drag in a file to paste the path
-                        li Click paths and URLs to open in browser/file manager
-                        li Keeps the current directory in new tabs
-
-                .col-6
-                    .mb-5
-                        h3 Customizable
-                        p Multiple app themes and a myriad of community color schemes for the terminal. Color scheme editor included.
-                        
-                    div        
-                        h3 Infinitely extensible
-                        p Install plugins from the NPM repository, or create your own with Typescript and Angular framework.
-                        
+        .background-stripe2
+            .overlay.overlay1
+                                        
         script.
           (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
           (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

docs/package.json

@@ -1,15 +1,24 @@
 {
   "name": "docs",
   "version": "1.0.0",
-  "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "pug index.pug",
-    "watch": "pug -w index.pug"
+    "build": "webpack --progress",
+    "watch": "webpack --progress --watch"
   },
-  "author": "",
-  "license": "ISC",
+  "private": true,
   "devDependencies": {
-    "pug-cli": "^1.0.0-alpha6"
+    "bootstrap": "^4.1.3",
+    "css-loader": "^1.0.0",
+    "file-loader": "^1.1.11",
+    "node-sass": "^4.9.3",
+    "pug": "^2.0.3",
+    "pug-cli": "^1.0.0-alpha6",
+    "pug-html-loader": "^1.1.5",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.22.1",
+    "val-loader": "^1.1.1",
+    "webpack": "^4.16.5",
+    "webpack-cli": "^3.1.0"
   }
 }

docs/styles.scss

@@ -0,0 +1,141 @@
+$font-family-sans-serif: "Source Sans Pro";
+$border-radius-lg: 0;
+$btn-border-width: 3px;
+
+@import "node_modules/bootstrap/scss/bootstrap";
+
+
+h1 {
+    font-size: 10vw;
+    font-weight: 200;
+    margin: 0;
+}
+
+body {
+    overflow-x: hidden;
+}
+
+.subtitle {
+    font-style: italic;
+    color: #999;
+    font-size: 5vw;
+    font-weight: 300;
+}
+
+.background-stripe {
+    width: 100vw;
+    background-image: url('./background.jpeg');
+    background-size: cover;
+    height: 30vw;
+    margin: 200px 0 150px;
+    min-height: 1000px;
+    position: relative;
+
+    .overlay {
+        position: absolute;
+        width: 100vw;
+        width: 1px;
+        height: 1px;
+
+        &.overlay1 {
+            top: -1px;
+            left: 0;
+            border-top: 10vw solid white;
+            border-right: 100vw solid transparent;
+        }
+
+        &.overlay2 {
+            bottom: -1px;
+            right: 0;
+            border-bottom: 10vw solid white;
+            border-left: 100vw solid transparent;
+        }
+    }
+
+    .terminal {
+        position: absolute;
+        left: 50%;
+        top: 5vw;
+
+        width: 1304px;
+        margin-left: -652px;
+        height: 972px;
+        border-radius: 9px;
+
+        box-shadow: 0 0 100px black;
+        background: url('./terminal.png');
+        background-size: cover;
+
+        animation: slideIn ease-out 1s;
+        opacity: .95;
+    }
+
+    @media(max-width: 1500px) {
+        min-height: 500px;
+        margin: 200px 0 100px;
+
+        .terminal {
+            width: 652px;
+            top: -100px;
+            margin-left: -326px;
+            height: 486px;
+            border-radius: 5px;
+        }
+    }
+
+    @media(max-width: 750px) {
+        min-height: 250px;
+        margin: 100px 0 50px;
+
+        .terminal {
+            width: 326px;
+            top: -50px;
+            margin-left: -163px;
+            height: 243px;
+            border-radius: 3px;
+        }
+    }
+
+}
+
+.feature {
+    font-size: 45px;
+    line-height: 40px;
+    opacity: .5;
+    font-style: italic;
+}
+
+@keyframes slideIn {
+    from {
+        opacity: 0;
+        margin-top: 200px;
+    }
+    to {
+        opacity: .95;
+        margin-top: 0px;
+    }
+}
+
+
+.background-stripe2 {
+    width: 100vw;
+    background-image: url('./background.jpeg');
+    background-size: cover;
+    height: 30vw;
+    margin: 100px 0 0;
+    position: relative;
+
+    .overlay {
+        position: absolute;
+        width: 100vw;
+        width: 1px;
+        height: 1px;
+
+        &.overlay1 {
+            top: -1px;
+            right: 0;
+            border-top: 10vw solid white;
+            border-left: 100vw solid transparent;
+        }
+    }
+}

docs/webpack.config.js

@@ -0,0 +1,27 @@
+const path = require('path')
+
+module.exports = {
+  entry: {
+    'index.ignore': 'file-loader?name=../index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    'bundle': path.resolve(__dirname, 'index.js'),
+  },
+  context: __dirname,
+  output: {
+    path: path.join(__dirname, 'dist'),
+    filename: '[name].js'
+  },
+  module: {
+    rules: [
+      { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
+      {
+        test: /\.(jpeg|png)?$/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'assets/[name].[ext]'
+          }
+        }
+      }
+    ]
+  },
+}

package.json

@@ -1,48 +1,65 @@
 {
   "name": "term",
   "devDependencies": {
+    "@types/electron-config": "^0.2.1",
+    "@types/electron-debug": "^1.1.0",
     "@types/fs-promise": "1.0.1",
+    "@types/js-yaml": "^3.11.2",
     "@types/node": "7.0.5",
     "@types/webpack-env": "1.13.0",
     "apply-loader": "0.1.0",
-    "awesome-typescript-loader": "3.1.2",
+    "awesome-typescript-loader": "^5.0.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.6",
+    "babel-loader": "^7.1.5",
+    "babel-preset-es2015": "^6.24.1",
     "core-js": "2.4.1",
     "cross-env": "4.0.0",
     "css-loader": "0.28.0",
-    "electron": "1.6.16",
-    "electron-builder": "17.1.1",
+    "electron": "3.0.0-beta.9",
+    "electron-builder": "^20.27.1",
     "electron-builder-squirrel-windows": "17.0.1",
-    "electron-rebuild": "1.5.11",
-    "file-loader": "0.9.0",
+    "electron-installer-snap": "^3.0.0",
+    "electron-rebuild": "^1.8.2",
+    "eslint": "^5.4.0",
+    "eslint-config-standard": "^11.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-promise": "^4.0.0",
+    "eslint-plugin-standard": "^3.1.0",
+    "file-loader": "^1.1.11",
     "font-awesome": "4.7.0",
     "graceful-fs": "^4.1.11",
     "html-loader": "0.4.4",
     "json-loader": "0.5.4",
     "less": "2.7.1",
     "less-loader": "2.2.3",
-    "node-abi": "2.0.3",
+    "node-abi": "^2.4.1",
     "node-gyp": "^3.6.2",
     "node-sass": "^4.5.3",
     "npmlog": "4.1.0",
     "npx": "^9.7.1",
-    "pug": "2.0.0-beta11",
+    "pug": "^2.0.3",
     "pug-html-loader": "1.0.9",
-    "pug-loader": "2.3.0",
+    "pug-lint": "^2.5.0",
+    "pug-loader": "^2.4.0",
     "pug-static-loader": "0.0.1",
     "raven-js": "3.16.0",
     "raw-loader": "0.5.1",
-    "sass-loader": "6.0.3",
+    "sass-loader": "^7.0.1",
     "shelljs": "0.7.7",
     "source-sans-pro": "2.0.10",
     "style-loader": "0.13.1",
+    "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.5",
     "tslint": "5.1.0",
     "tslint-config-standard": "5.0.2",
     "tslint-eslint-rules": "4.0.0",
-    "typescript": "2.2.2",
+    "typescript": "^2.8.3",
     "url-loader": "0.5.7",
     "val-loader": "0.5.0",
-    "webpack": "^3.0.0",
+    "webpack": "^4.8.3",
+    "webpack-cli": "^2.1.3",
     "yaml-loader": "0.4.0",
     "yarn": "^1.3.2"
   },
@@ -50,6 +67,10 @@
     "appId": "org.terminus",
     "productName": "Terminus",
     "compression": "normal",
+    "files": [
+      "**/*",
+      "dist"
+    ],
     "extraResources": [
       "builtin-plugins",
       "clink"
@@ -67,10 +88,12 @@
     "mac": {
       "category": "public.app-category.video",
       "icon": "./build/mac/icon.icns",
-      "identity": null,
       "publish": [
         "github"
-      ]
+      ],
+      "extendInfo": {
+        "NSRequiresAquaSystemAppearance": false
+      }
     },
     "dmg": {
       "artifactName": "terminus-${version}-${os}-${arch}.dmg"
@@ -91,7 +114,6 @@
         "libappindicator1",
         "libxtst6",
         "libnss3",
-        "python-gnomekeyring",
         "tmux"
       ],
       "artifactName": "terminus-${version}-${os}-${arch}.deb"
@@ -105,10 +127,10 @@
     }
   },
   "scripts": {
-    "build": "webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
-    "watch": "webpack --progress --color --watch",
-    "start": "cross-env DEV=1 electron --js-flags='--ignition' app --debug",
-    "prod": "cross-env DEV=1 electron --js-flags='--ignition' app",
+    "build": "webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
+    "watch": "DEV=1 webpack --progress --color --watch",
+    "start": "cross-env DEV=1 electron app --debug",
+    "prod": "cross-env DEV=1 electron app",
     "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
     "postinstall": "install-app-deps"
   },

scripts/build-linux.js

@@ -4,10 +4,11 @@ const vars = require('./vars')
 
 builder({
   dir: true,
-  linux: ['deb', 'rpm', 'tar.gz'],
-  extraMetadata: {
-    version: vars.version,
+  linux: ['snap', 'deb', 'rpm', 'tar.gz'],
+  config: {
+    extraMetadata: {
+      version: vars.version,
+    },
   },
   publish: 'onTag',
-  draft: false
 })

scripts/build-macos.js

@@ -5,9 +5,10 @@ const vars = require('./vars')
 builder({
   dir: true,
   mac: ['dmg'],
-  extraMetadata: {
-    version: vars.version,
+  config: {
+    extraMetadata: {
+      version: vars.version,
+    },
   },
   publish: 'onTag',
-  draft: false
 })

scripts/build-native.js

@@ -3,5 +3,25 @@ const rebuild = require('electron-rebuild').default
 const path = require('path')
 const vars = require('./vars')
 
-rebuild(path.resolve(__dirname, '../terminus-ssh'), vars.electronVersion, process.arch, [], true)
-rebuild(path.resolve(__dirname, '../terminus-terminal'), vars.electronVersion, process.arch, [], true)
+lifecycles = []
+lifecycles.push(rebuild({
+  buildPath: path.resolve(__dirname, '../app'),
+  electronVersion: vars.electronVersion,
+  force: true,
+}).lifecycle)
+lifecycles.push(rebuild({
+  buildPath: path.resolve(__dirname, '../terminus-ssh'),
+  electronVersion: vars.electronVersion,
+  force: true,
+}).lifecycle)
+lifecycles.push(rebuild({
+  buildPath: path.resolve(__dirname, '../terminus-terminal'),
+  electronVersion: vars.electronVersion,
+  force: true,
+}).lifecycle)
+
+for (let lc of lifecycles) {
+  lc.on('module-found', name => {
+    console.info('Rebuilding', name)
+  })
+}

scripts/build-windows.js

@@ -5,9 +5,10 @@ const vars = require('./vars')
 builder({
   dir: true,
   win: ['squirrel'],
-  extraMetadata: {
-    version: vars.version,
+  config: {
+    extraMetadata: {
+      version: vars.version,
+    },
   },
   publish: 'onTag',
-  draft: false
 })

scripts/install-deps.js

@@ -20,3 +20,14 @@ vars.builtinPlugins.forEach(plugin => {
   sh.exec(`${npx} yarn install`)
   sh.cd('..')
 })
+
+if (['darwin', 'linux'].includes(process.platform)) {
+  sh.cd('node_modules')
+  for (let x of vars.builtinPlugins) {
+    sh.ln('-fs', '../' + x, x)
+  }
+  for (let x of vars.bundledModules) {
+    sh.ln('-fs', '../app/node_modules/' + x, x)
+  }
+  sh.cd('..')
+}

scripts/vars.js

@@ -16,5 +16,9 @@ exports.builtinPlugins = [
   'terminus-plugin-manager',
   'terminus-ssh',
 ]
-exports.nativeModules = ['node-pty-tmp', 'font-manager', 'xkeychain']
+exports.bundledModules = [
+  '@angular',
+  '@ng-bootstrap',
+]
+exports.nativeModules = ['node-pty-tmp', 'font-manager', 'xkeychain', 'electron-vibrancy']
 exports.electronVersion = pkgInfo.devDependencies.electron

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.0-alpha.36",
+  "version": "1.0.0-alpha.48",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"

terminus-community-color-schemes/schemes/Tango

@@ -0,0 +1,36 @@
+! special
+*.foreground:   #babdb6
+*.background:   #000000
+*.cursorColor:  #babdb6
+
+! black
+*.color0:       #2e3436
+*.color8:       #555753
+
+! red
+*.color1:       #cc0000
+*.color9:       #ef2929
+
+! green
+*.color2:       #4e9a06
+*.color10:      #8ae234
+
+! yellow
+*.color3:       #c4a000
+*.color11:      #fce94f
+
+! blue
+*.color4:       #3465a4
+*.color12:      #729fcf
+
+! magenta
+*.color5:       #75507b
+*.color13:      #ad7fa8
+
+! cyan
+*.color6:       #06989a
+*.color14:      #34e2e2
+
+! white
+*.color7:       #d3d7cf
+*.color15:      #eeeeec

terminus-community-color-schemes/webpack.config.js

@@ -13,25 +13,28 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]',
   },
+  mode: process.env.DEV ? 'development' : 'production',
   resolve: {
     modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
     extensions: ['.ts', '.js'],
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.ts$/,
-        loader: 'awesome-typescript-loader',
-        options: {
-          configFileName: path.resolve(__dirname, 'tsconfig.json'),
-          typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-          paths: {
-            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+        use: {
+          loader: 'awesome-typescript-loader',
+          options: {
+            configFileName: path.resolve(__dirname, 'tsconfig.json'),
+            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
+            paths: {
+              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+              "*": [path.resolve(__dirname, '../app/node_modules/*')],
+            }
           }
         }
       },
-      { test: /[\\\/]schemes[\\\/]/, loader: "raw-loader" },
+      { test: /[\\\/]schemes[\\\/]/, use: "raw-loader" },
     ]
   },
   externals: [

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.0-alpha.36",
+  "version": "1.0.0-alpha.48",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -22,11 +22,12 @@
     "@types/webpack-env": "^1.13.0",
     "@types/winston": "^2.3.6",
     "axios": "0.16.2",
-    "bootstrap": "4.0.0-alpha.6",
+    "bootstrap": "^4.1.3",
     "core-js": "^2.4.1",
     "electron-updater": "^2.8.9",
-    "ngx-perfect-scrollbar": "4.0.0",
-    "typescript": "^2.4.1"
+    "ng2-dnd": "^5.0.2",
+    "ngx-perfect-scrollbar": "^6.0.0",
+    "universal-analytics": "^0.4.17"
   },
   "peerDependencies": {
     "@angular/animations": "4.0.1",

terminus-core/src/api/defaultTabProvider.ts

@@ -1,3 +0,0 @@
-export abstract class DefaultTabProvider {
-    abstract async openNewTab (): Promise<void>
-}

terminus-core/src/api/index.ts

@@ -3,7 +3,6 @@ export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
 export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'
-export { DefaultTabProvider } from './defaultTabProvider'
 export { Theme } from './theme'
 
 export { AppService } from '../services/app.service'
@@ -11,6 +10,7 @@ export { ConfigService } from '../services/config.service'
 export { DockingService } from '../services/docking.service'
 export { ElectronService } from '../services/electron.service'
 export { Logger, LogService } from '../services/log.service'
+export { HomeBaseService } from '../services/homeBase.service'
 export { HotkeysService } from '../services/hotkeys.service'
 export { HostAppService, Platform } from '../services/hostApp.service'
 export { ThemesService } from '../services/themes.service'

terminus-core/src/api/toolbarButtonProvider.ts

@@ -1,6 +1,10 @@
+import { SafeHtml } from '@angular/platform-browser'
+
 export interface IToolbarButton {
-    icon: string
+    icon: SafeHtml
+    touchBarNSImage?: string
     title: string
+    touchBarTitle?: string
     weight?: number
     click: () => void
 }

terminus-core/src/components/appRoot.component.pug

@@ -1,5 +1,5 @@
 title-bar(
-  *ngIf='!hostApp.getWindow().isFullScreen() && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
+  *ngIf='!hostApp.isFullScreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
   [class.inset]='hostApp.platform == Platform.macOS'
 )
 
@@ -7,57 +7,65 @@ title-bar(
     [class.tabs-on-top]='config.store.appearance.tabsLocation == "top"'
 )
     .tab-bar(
-        *ngIf='!hostApp.getWindow().isFullScreen()',
-        [class.inset]='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"'
+        *ngIf='!hostApp.isFullScreen',
     )
-        .tabs
+        .inset.background(*ngIf='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"')
+        .tabs(
+            dnd-sortable-container,
+            [sortableData]='app.tabs',
+        )
             tab-header(
                 *ngFor='let tab of app.tabs; let idx = index',
+                dnd-sortable,
+                [sortableIndex]='idx',
+                (onDragStart)='onTabDragStart()',
+                (onDragEnd)='onTabDragEnd()',
+
                 [index]='idx',
                 [tab]='tab',
                 [active]='tab == app.activeTab',
-                [hasActivity]='tab.hasActivity',
-                [class.drag-region]='hostApp.platform == Platform.macOS',
+                [hasActivity]='tab.activity$|async',
                 @animateTab,
                 (click)='app.selectTab(tab)',
+                [class.fully-draggable]='hostApp.platform != Platform.macOS',
+                [class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
             )
 
-        .btn-group
+        .btn-group.background
             button.btn.btn-secondary.btn-tab-bar(
                 *ngFor='let button of leftToolbarButtons',
                 [title]='button.title',
                 (click)='button.click()',
+                [innerHTML]='button.icon',
             )
-                i.fa([class]='"fa fa-" + button.icon')
 
-        .drag-space([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
+        .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
 
-        .btn-group
+        .btn-group.background
             button.btn.btn-secondary.btn-tab-bar(
                 *ngFor='let button of rightToolbarButtons',
                 [title]='button.title',
                 (click)='button.click()',
+                [innerHTML]='button.icon',
             )
-                i.fa([class]='"fa fa-" + button.icon')
-            button.btn.btn-secondary.btn-tab-bar(
+
+            button.btn.btn-secondary.btn-tab-bar.btn-update(
                 *ngIf='appUpdate',
                 title='Update available',
                 (click)='updateApp()',
+                [innerHTML]='updateIcon'
             )
-                i.fa.fa-arrow-up.text-info
-                span.text-info Update
 
-        window-controls(
+        window-controls.background(
             *ngIf='config.store.appearance.frame == "thin" && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
         )
 
     start-page(*ngIf='ready && app.tabs.length == 0')
 
     tab-body(
-        *ngFor='let tab of app.tabs; trackBy: tab?.id',
+        *ngFor='let tab of unsortedTabs',
         [active]='tab == app.activeTab',
         [tab]='tab',
-        [scrollable]='tab.scrollable',
     )
 
 ng-template(ngbModalContainer)

terminus-core/src/components/appRoot.component.scss

@@ -35,6 +35,7 @@ $tab-border-radius: 4px;
         line-height: $tabs-height + 2px;
         cursor: pointer;
 
+        display: flex;
         padding: 0 15px;
         flex: 0 0 auto;
         border-bottom: 2px solid transparent;
@@ -46,7 +47,6 @@ $tab-border-radius: 4px;
         color: #aaa;
         border: none;
         border-radius: 0;
-
     }
 
     &>.tabs {
@@ -66,12 +66,13 @@ $tab-border-radius: 4px;
         }
     }
 
-    &.inset {
-        padding-left: 85px;
+    & > .inset {
+        width: 85px;
+        flex: none;
     }
 
     window-controls {
-      margin-left: 10px;
+        padding-left: 10px;
     }
 }
 
@@ -86,3 +87,13 @@ hotkey-hint {
     right: 0;
     max-width: 300px;
 }
+
+::ng-deep .btn-tab-bar svg {
+    height: 16px;
+    fill: white;
+    fill-opacity: 0.75;
+}
+
+::ng-deep .btn-update svg {
+    fill: cyan;
+}

terminus-core/src/components/appRoot.component.ts

@@ -1,5 +1,6 @@
-import { Component, Inject, Input, HostListener } from '@angular/core'
+import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { ElectronService } from '../services/electron.service'
@@ -11,7 +12,9 @@ import { DockingService } from '../services/docking.service'
 import { TabRecoveryService } from '../services/tabRecovery.service'
 import { ThemesService } from '../services/themes.service'
 import { UpdaterService, Update } from '../services/updater.service'
+import { TouchbarService } from '../services/touchbar.service'
 
+import { BaseTabComponent } from './baseTab.component'
 import { SafeModeModalComponent } from './safeModeModal.component'
 import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
 
@@ -53,6 +56,10 @@ export class AppRootComponent {
     @Input() ready = false
     @Input() leftToolbarButtons: IToolbarButton[]
     @Input() rightToolbarButtons: IToolbarButton[]
+    @HostBinding('class') hostClass = `platform-${process.platform}`
+    tabsDragging = false
+    unsortedTabs: BaseTabComponent[] = []
+    updateIcon: SafeHtml
     private logger: Logger
     private appUpdate: Update
 
@@ -62,12 +69,14 @@ export class AppRootComponent {
         private tabRecovery: TabRecoveryService,
         private hotkeys: HotkeysService,
         private updater: UpdaterService,
+        private touchbar: TouchbarService,
         public hostApp: HostAppService,
         public config: ConfigService,
         public app: AppService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
         log: LogService,
         ngbModal: NgbModal,
+        domSanitizer: DomSanitizer,
         _themes: ThemesService,
     ) {
         this.logger = log.create('main')
@@ -76,6 +85,8 @@ export class AppRootComponent {
         this.leftToolbarButtons = this.getToolbarButtons(false)
         this.rightToolbarButtons = this.getToolbarButtons(true)
 
+        this.updateIcon = domSanitizer.bypassSecurityTrustHtml(require('../icons/gift.svg')),
+
         this.hotkeys.matchedHotkey.subscribe((hotkey) => {
             if (hotkey.startsWith('tab-')) {
                 let index = parseInt(hotkey.split('-')[1])
@@ -121,25 +132,48 @@ export class AppRootComponent {
         this.updater.check().then(update => {
             this.appUpdate = update
         })
+
+        this.touchbar.update()
+
+        config.changed$.subscribe(() => this.updateVibrancy())
+        this.updateVibrancy()
+
+        this.app.tabOpened$.subscribe(tab => {
+            this.unsortedTabs.push(tab)
+            tab.progress$.subscribe(progress => {
+                if (progress !== null) {
+                    this.hostApp.getWindow().setProgressBar(progress / 100.0, { mode: 'normal' })
+                } else {
+                    this.hostApp.getWindow().setProgressBar(-1, { mode: 'none' })
+                }
+            })
+        })
+        this.app.tabClosed$.subscribe(tab => {
+            this.unsortedTabs = this.unsortedTabs.filter(x => x !== tab)
+        })
     }
 
     onGlobalHotkey () {
-        if (this.electron.app.window.isFocused()) {
+        if (this.hostApp.getWindow().isFocused()) {
             // focused
-            this.electron.app.window.hide()
+            this.electron.loseFocus()
+            if (this.hostApp.platform !== Platform.macOS) {
+                this.hostApp.getWindow().hide()
+            }
         } else {
-            if (!this.electron.app.window.isVisible()) {
+            if (!this.hostApp.getWindow().isVisible()) {
                 // unfocused, invisible
-                this.electron.app.window.show()
+                this.hostApp.getWindow().show()
+                this.hostApp.getWindow().focus()
             } else {
                 if (this.config.store.appearance.dock === 'off') {
                     // not docked, visible
                     setTimeout(() => {
-                        this.electron.app.window.focus()
+                        this.hostApp.getWindow().focus()
                     })
                 } else {
                     // docked, visible
-                    this.electron.app.window.hide()
+                    this.hostApp.getWindow().hide()
                 }
             }
         }
@@ -150,10 +184,6 @@ export class AppRootComponent {
         this.ready = true
         this.tabRecovery.saveTabs(this.app.tabs)
 
-        if (this.app.tabs.length === 0) {
-            this.app.openDefaultTab()
-        }
-
         this.app.emitReady()
     }
 
@@ -171,6 +201,17 @@ export class AppRootComponent {
         this.electron.shell.openExternal(this.appUpdate.url)
     }
 
+    onTabDragStart () {
+        this.tabsDragging = true
+    }
+
+    onTabDragEnd () {
+        setTimeout(() => {
+            this.tabsDragging = false
+            this.app.emitTabsChanged()
+        })
+    }
+
     private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
         let buttons: IToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
@@ -180,4 +221,9 @@ export class AppRootComponent {
             .filter((button) => (button.weight > 0) === aboveZero)
             .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
     }
+
+    private updateVibrancy () {
+        this.hostApp.setVibrancy(this.config.store.appearance.vibrancy)
+        this.hostApp.getWindow().setOpacity(this.config.store.appearance.opacity)
+    }
 }

terminus-core/src/components/baseTab.component.ts

@@ -1,4 +1,4 @@
-import { Subject } from 'rxjs'
+import { Observable, Subject } from 'rxjs'
 import { ViewRef } from '@angular/core'
 
 export abstract class BaseTabComponent {
@@ -6,12 +6,22 @@ export abstract class BaseTabComponent {
     id: number
     title: string
     customTitle: string
-    scrollable: boolean
-    hasActivity = false
-    focused$ = new Subject<void>()
-    blurred$ = new Subject<void>()
     hasFocus = false
+    hasActivity = false
     hostView: ViewRef
+    protected titleChange = new Subject<string>()
+    protected focused = new Subject<void>()
+    protected blurred = new Subject<void>()
+    protected progress = new Subject<number>()
+    protected activity = new Subject<boolean>()
+
+    private progressClearTimeout: number
+
+    get focused$ (): Observable<void> { return this.focused }
+    get blurred$ (): Observable<void> { return this.blurred }
+    get titleChange$ (): Observable<string> { return this.titleChange }
+    get progress$ (): Observable<number> { return this.progress }
+    get activity$ (): Observable<boolean> { return this.activity }
 
     constructor () {
         this.id = BaseTabComponent.lastTabID++
@@ -23,8 +33,33 @@ export abstract class BaseTabComponent {
         })
     }
 
+    setTitle (title: string) {
+        this.title = title
+        if (!this.customTitle) {
+            this.titleChange.next(title)
+        }
+    }
+
+    setProgress (progress: number) {
+        this.progress.next(progress)
+        if (progress) {
+            if (this.progressClearTimeout) {
+                clearTimeout(this.progressClearTimeout)
+            }
+            this.progressClearTimeout = setTimeout(() => {
+                this.setProgress(null)
+            }, 5000)
+        }
+    }
+
     displayActivity (): void {
         this.hasActivity = true
+        this.activity.next(true)
+    }
+
+    clearActivity (): void {
+        this.hasActivity = false
+        this.activity.next(false)
     }
 
     getRecoveryToken (): any {
@@ -35,8 +70,18 @@ export abstract class BaseTabComponent {
         return true
     }
 
+    emitFocused () {
+        this.focused.next()
+    }
+
+    emitBlurred () {
+        this.blurred.next()
+    }
+
     destroy (): void {
-        this.focused$.complete()
-        this.blurred$.complete()
+        this.focused.complete()
+        this.blurred.complete()
+        this.titleChange.complete()
+        this.progress.complete()
     }
 }

terminus-core/src/components/checkbox.component.pug

@@ -0,0 +1,4 @@
+.icon(tabindex='0', [class.active]='model', (keyup.space)='click()')
+    i.fa.fa-square-o.off
+    i.fa.fa-check-square.on
+.text {{text}}

terminus-core/src/components/checkbox.component.scss

@@ -0,0 +1,51 @@
+:host {
+    cursor: pointer;
+    margin: 5px 0;
+
+    &:focus {
+        background: rgba(255,255,255,.05);
+        border-radius: 5px;
+    }
+
+    &:active {
+        background: rgba(255,255,255,.1);
+        border-radius: 3px;
+    }
+
+    &[disabled] {
+        opacity: 0.5;
+    }
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .icon {
+        position: relative;
+        flex: none;
+        width: 14px;
+        height: 14px;
+
+        i {
+            position: absolute;
+            left: 0;
+            top: -2px;
+            transition: 0.25s opacity;
+            display: block;
+            font-size: 18px;
+        }
+
+        i.on, &.active i.off {
+            opacity: 0;
+        }
+
+        i.off, &.active i.on {
+            opacity: 1;
+        }
+    }
+
+    .text {
+        flex: auto;
+        margin-left: 8px;
+    }
+}

terminus-core/src/components/checkbox.component.ts

@@ -0,0 +1,45 @@
+import { NgZone, Component, Input, HostBinding, HostListener } from '@angular/core'
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+
+@Component({
+    selector: 'checkbox',
+    template: require('./checkbox.component.pug'),
+    styles: [require('./checkbox.component.scss')],
+    providers: [
+        { provide: NG_VALUE_ACCESSOR, useExisting: CheckboxComponent, multi: true },
+    ]
+})
+export class CheckboxComponent implements ControlValueAccessor {
+    @HostBinding('class.active') @Input() model: boolean
+    @Input() disabled: boolean
+    @Input() text: string
+    private changed = new Array<(val: boolean) => void>()
+
+    @HostListener('click') click () {
+        NgZone.assertInAngularZone()
+        if (this.disabled) {
+            return
+        }
+
+        this.model = !this.model
+        for (let fx of this.changed) {
+            fx(this.model)
+        }
+    }
+
+    writeValue (obj: any) {
+        this.model = obj
+    }
+
+    registerOnChange (fn: any): void {
+        this.changed.push(fn)
+    }
+
+    registerOnTouched (fn: any): void {
+        this.changed.push(fn)
+    }
+
+    setDisabledState (isDisabled: boolean) {
+        this.disabled = isDisabled
+    }
+}

terminus-core/src/components/startPage.component.pug

@@ -4,21 +4,20 @@ div
         sup α 
 
     .list-group
-        a.list-group-item.list-group-item-action(
+        a.list-group-item.list-group-item-action.d-flex(
             *ngFor='let button of getButtons()',
             (click)='button.click()',
         )
-            i([class]='"fa fa-fw fa-" + button.icon')
+            .d-flex.align-self-center([innerHTML]='button.icon')
             span {{button.title}}
 
-footer
-    .pull-right
-        .form-control-static Version: {{version}}
-            
-    .btn-group
-        button.btn.btn-secondary((click)='openGitHub()')
+footer.d-flex.align-items-center
+    .btn-group.mr-auto
+        button.btn.btn-secondary((click)='homeBase.openGitHub()')
             i.fa.fa-github
             span GitHub
-        button.btn.btn-secondary((click)='reportBug()')
+        button.btn.btn-secondary((click)='homeBase.reportBug()')
             i.fa.fa-bug
             span Report a problem
+
+    .form-control-static Version: {{homeBase.appVersion}}

terminus-core/src/components/startPage.component.scss

@@ -3,6 +3,7 @@
     flex-direction: column;
     flex: auto;
     -webkit-app-region: drag;
+    overflow-y: auto;
 }
 
 :host > div {
@@ -27,3 +28,11 @@ footer {
 a, button {
     -webkit-app-region: no-drag;
 }
+
+.list-group-item ::ng-deep svg {
+    width: 16px;
+    height: 16px;
+    margin-right: 10px;
+    fill: white;
+    fill-opacity: 0.75;
+}

terminus-core/src/components/startPage.component.ts

@@ -1,7 +1,6 @@
-import * as os from 'os'
 import { Component, Inject } from '@angular/core'
-import { ElectronService } from '../services/electron.service'
 import { ConfigService } from '../services/config.service'
+import { HomeBaseService } from '../services/homeBase.service'
 import { IToolbarButton, ToolbarButtonProvider } from '../api'
 
 @Component({
@@ -13,11 +12,10 @@ export class StartPageComponent {
     version: string
 
     constructor (
-        private electron: ElectronService,
         private config: ConfigService,
+        public homeBase: HomeBaseService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
     ) {
-        this.version = electron.app.getVersion()
     }
 
     getButtons (): IToolbarButton[] {
@@ -26,19 +24,4 @@ export class StartPageComponent {
             .reduce((a, b) => a.concat(b))
             .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
     }
-
-    openGitHub () {
-        this.electron.shell.openExternal('https://github.com/eugeny/terminus')
-    }
-
-    reportBug () {
-        let body = `Version: ${this.version}\n`
-        body += `Platform: ${os.platform()} ${os.release()}\n\n`
-        let label = {
-            darwin: 'macOS',
-            windows: 'Windows',
-            linux: 'Linux',
-        }[os.platform()]
-        this.electron.shell.openExternal(`https://github.com/eugeny/terminus/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
-    }
 }

terminus-core/src/components/tabBody.component.scss

@@ -4,10 +4,6 @@
     position: relative;
     overflow: hidden;
 
-    &.scrollable {
-        overflow-y: auto;
-    }
-
     &.active {
         display: flex;
 
@@ -15,4 +11,9 @@
             flex: auto;
         }
     }
+
+    > perfect-scrollbar {
+        width: auto;
+        height: auto;
+    }
 }

terminus-core/src/components/tabBody.component.ts

@@ -1,29 +1,36 @@
-import { Component, Input, ViewChild, HostBinding, ViewContainerRef } from '@angular/core'
+import { Component, Input, ViewChild, HostBinding, ViewContainerRef, OnChanges } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
 
 @Component({
     selector: 'tab-body',
     template: `
-        <perfect-scrollbar [config]="{ suppressScrollX: true }" *ngIf="scrollable">
+        <!--perfect-scrollbar [config]="{ suppressScrollX: true }" *ngIf="scrollable">
             <ng-template #scrollablePlaceholder></ng-template>
-        </perfect-scrollbar>
-        <template #nonScrollablePlaceholder [ngIf]="!scrollable"></template>
+        </perfect-scrollbar-->
+        <ng-template #placeholder></ng-template>
     `,
     styles: [
         require('./tabBody.component.scss'),
         require('./tabBody.deep.component.css'),
     ],
 })
-export class TabBodyComponent {
+export class TabBodyComponent implements OnChanges {
     @Input() @HostBinding('class.active') active: boolean
     @Input() tab: BaseTabComponent
-    @Input() scrollable: boolean
-    @ViewChild('scrollablePlaceholder', {read: ViewContainerRef}) scrollablePlaceholder: ViewContainerRef
-    @ViewChild('nonScrollablePlaceholder', {read: ViewContainerRef}) nonScrollablePlaceholder: ViewContainerRef
+    @ViewChild('placeholder', {read: ViewContainerRef}) placeholder: ViewContainerRef
 
-    ngAfterViewInit () {
-        setImmediate(() => {
-            (this.scrollable ? this.scrollablePlaceholder : this.nonScrollablePlaceholder).insert(this.tab.hostView)
-        })
+    ngOnChanges (changes) {
+        if (changes.tab) {
+            if (this.placeholder) {
+                this.placeholder.detach()
+            }
+            setImmediate(() => {
+                this.placeholder.insert(this.tab.hostView)
+            })
+        }
+    }
+
+    ngOnDestroy () {
+        this.placeholder.detach()
     }
 }

terminus-core/src/components/tabHeader.component.pug

@@ -1,3 +1,4 @@
-.index {{index + 1}}
+.progressbar([style.width]='progress + "%"', *ngIf='progress != null')
+.index(#handle) {{index + 1}}
 .name([title]='tab.customTitle || tab.title') {{tab.customTitle || tab.title}}
 button((click)='app.closeTab(tab, true)') ×

terminus-core/src/components/tabHeader.component.scss

@@ -1,6 +1,7 @@
 $tabs-height: 36px;
 
 :host {
+    position: relative;
     cursor: pointer;
 
     flex: 1000 1 200px;
@@ -14,11 +15,11 @@ $tabs-height: 36px;
 
     transition: 0.125s ease-out all;
 
-    border-top: 1px solid transparent;
-
     .index {
         flex: none;
         font-weight: bold;
+        -webkit-app-region: no-drag;
+        cursor: -webkit-grab;
 
         margin-left: 10px;
         width: 20px;
@@ -44,11 +45,11 @@ $tabs-height: 36px;
         background: transparent;
         opacity: 0;
 
-        $button-size: 23px;
+        $button-size: 26px;
         width: $button-size;
         height: $button-size;
         border-radius: $button-size / 2;
-        line-height: $button-size * 0.87;
+        line-height: $button-size;
         align-self: center;
         margin-right: 10px;
 
@@ -69,4 +70,17 @@ $tabs-height: 36px;
     &.drag-region {
         -webkit-app-region: drag;
     }
+
+    &.fully-draggable {
+        cursor: -webkit-grab;
+    }
+
+    .progressbar {
+        position: absolute;
+        left: 0;
+        top: 0;
+        height: 5px;
+        z-index: -1;
+        transition: 0.25s width;
+    }
 }

terminus-core/src/components/tabHeader.component.ts

@@ -1,9 +1,11 @@
-import { Component, Input, HostBinding, HostListener, NgZone } from '@angular/core'
+import { Component, Input, HostBinding, HostListener, NgZone, ViewChild, ElementRef } from '@angular/core'
+import { SortableComponent } from 'ng2-dnd'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { BaseTabComponent } from './baseTab.component'
 import { RenameTabModalComponent } from './renameTabModal.component'
 import { ElectronService } from '../services/electron.service'
 import { AppService } from '../services/app.service'
+import { HostAppService, Platform } from '../services/hostApp.service'
 
 @Component({
     selector: 'tab-header',
@@ -15,13 +17,18 @@ export class TabHeaderComponent {
     @Input() @HostBinding('class.active') active: boolean
     @Input() @HostBinding('class.has-activity') hasActivity: boolean
     @Input() tab: BaseTabComponent
+    @Input() progress: number
+    @ViewChild('handle') handle: ElementRef
+
     private contextMenu: any
 
     constructor (
         zone: NgZone,
         electron: ElectronService,
         public app: AppService,
+        private hostApp: HostAppService,
         private ngbModal: NgbModal,
+        private parentDraggable: SortableComponent,
     ) {
         this.contextMenu = electron.remote.Menu.buildFromTemplate([
             {
@@ -65,10 +72,20 @@ export class TabHeaderComponent {
         ])
     }
 
+    ngOnInit () {
+        if (this.hostApp.platform === Platform.macOS) {
+            this.parentDraggable.setDragHandle(this.handle.nativeElement)
+        }
+        this.tab.progress$.subscribe(progress => {
+            this.progress = progress
+        })
+    }
+
     @HostListener('dblclick') onDoubleClick (): void {
         let modal = this.ngbModal.open(RenameTabModalComponent)
         modal.componentInstance.value = this.tab.customTitle || this.tab.title
         modal.result.then(result => {
+            this.tab.setTitle(result)
             this.tab.customTitle = result
         }).catch(() => null)
     }

terminus-core/src/components/toggle.component.scss

@@ -0,0 +1,70 @@
+:host {
+    flex: none;
+    $toggle-size: 18px;
+    $height: 30px;
+    $padding: 2px;
+    cursor: pointer;
+    display: inline-flex;
+    overflow: visible;
+    border-radius: 3px;
+    line-height: $height;
+    height: $height;
+    transition: 0.25s opacity;
+    align-items: center;
+    overflow: hidden;
+    padding-right: 10px;
+    padding-left: 10px;
+    margin-left: -10px;
+
+    &:focus {
+        background: rgba(255,255,255,.05);
+        border-radius: 5px;
+    }
+
+    &[disabled] {
+        opacity: 0.5;
+    }
+
+    .body {
+        $border-width: 2px;
+        border-radius: 5px;
+        border: $border-width solid rgba(255, 255, 255, .2);
+        padding: $padding;
+        height: $toggle-size + $border-width * 2 + $padding * 2;
+        width: $toggle-size * 2 + $border-width * 2 + $padding * 2;
+
+        position: relative;
+
+        .toggle {
+            position: absolute;
+            border-radius: 2px;
+            width: $toggle-size;
+            height: $toggle-size;
+            background: #475158;
+            top: $padding;
+            left: $padding;
+            transition: 0.25s left;
+            line-height: 19px;
+            text-align: center;
+            font-size: 10px;
+
+            i {
+                opacity: 0;
+                transition: 0.25s opacity;
+            }
+        }
+    }
+
+    &.active .body .toggle {
+        left: $toggle-size + $padding;
+
+        i {
+            color: white;
+            opacity: 1;
+        }
+    }
+
+    &:active {
+        background: rgba(255,255,255,.1);
+    }
+}

terminus-core/src/components/toggle.component.ts

@@ -0,0 +1,22 @@
+import { Component } from '@angular/core'
+import { NG_VALUE_ACCESSOR } from '@angular/forms'
+import { CheckboxComponent } from './checkbox.component'
+
+@Component({
+    selector: 'toggle',
+    template: `
+      <div class="switch">
+        <div class="body">
+          <div class="toggle" [class.bg-primary]='model'>
+            <i class="fa fa-check"></i>
+          </div>
+        </div>
+      </div>
+    `,
+    styles: [require('./toggle.component.scss')],
+    providers: [
+        { provide: NG_VALUE_ACCESSOR, useExisting: ToggleComponent, multi: true },
+    ]
+})
+export class ToggleComponent extends CheckboxComponent {
+}

terminus-core/src/configDefaults.linux.yaml

@@ -1,4 +1,6 @@
 hotkeys:
+  new-window:
+    - 'Ctrl-Shift-N'
   toggle-window:
     - 'Ctrl+Space'
   toggle-fullscreen:

terminus-core/src/configDefaults.macos.yaml

@@ -1,4 +1,6 @@
 hotkeys:
+  new-window:
+    - '⌘-N'
   toggle-window:
     - 'Ctrl+Space'
   toggle-fullscreen:

terminus-core/src/configDefaults.windows.yaml

@@ -1,4 +1,6 @@
 hotkeys:
+  new-window:
+    - 'Ctrl-Shift-N'
   toggle-window:
     - 'Ctrl+Space'
   toggle-fullscreen:

terminus-core/src/configDefaults.yaml

@@ -7,3 +7,6 @@ appearance:
   theme: Standard
   frame: thin
   css: '/* * { color: blue !important; } */'
+  opacity: 1.0
+  vibrancy: false
+enableAnalytics: true

terminus-core/src/directives/autofocus.directive.ts

@@ -0,0 +1,15 @@
+import { Directive, AfterViewInit, ElementRef } from '@angular/core'
+
+@Directive({
+    selector: '[autofocus]'
+})
+export class AutofocusDirective implements AfterViewInit {
+    constructor (private el: ElementRef) { }
+
+    ngAfterViewInit () {
+        this.el.nativeElement.blur()
+        setTimeout(() => {
+            this.el.nativeElement.focus()
+        })
+    }
+}

terminus-core/src/icons/gift.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M32 448c0 17.7 14.3 32 32 32h160V320H32v128zm448-288h-42.1c6.2-12.1 10.1-25.5 10.1-40 0-48.5-39.5-88-88-88-41.6 0-68.5 21.3-103 68.3-34.5-47-61.4-68.3-103-68.3-48.5 0-88 39.5-88 88 0 14.5 3.8 27.9 10.1 40H32c-17.7 0-32 14.3-32 32v80c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16v-80c0-17.7-14.3-32-32-32zm-326.1 0c-22.1 0-40-17.9-40-40s17.9-40 40-40c19.9 0 34.6 3.3 86.1 80h-86.1zm206.1 0h-86.1c51.4-76.5 65.7-80 86.1-80 22.1 0 40 17.9 40 40s-17.9 40-40 40zm-72 320h160c17.7 0 32-14.3 32-32V320H288v160z"/></svg>

terminus-core/src/index.ts

@@ -3,28 +3,35 @@ import { BrowserModule } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
-import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'
+import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'
+import { DndModule } from 'ng2-dnd'
 
 import { AppService } from './services/app.service'
 import { ConfigService } from './services/config.service'
 import { ElectronService } from './services/electron.service'
 import { HostAppService } from './services/hostApp.service'
 import { LogService } from './services/log.service'
+import { HomeBaseService } from './services/homeBase.service'
 import { HotkeysService, AppHotkeyProvider } from './services/hotkeys.service'
 import { DockingService } from './services/docking.service'
 import { TabRecoveryService } from './services/tabRecovery.service'
 import { ThemesService } from './services/themes.service'
+import { TouchbarService } from './services/touchbar.service'
 import { UpdaterService } from './services/updater.service'
 
 import { AppRootComponent } from './components/appRoot.component'
+import { CheckboxComponent } from './components/checkbox.component'
 import { TabBodyComponent } from './components/tabBody.component'
 import { SafeModeModalComponent } from './components/safeModeModal.component'
 import { StartPageComponent } from './components/startPage.component'
 import { TabHeaderComponent } from './components/tabHeader.component'
 import { TitleBarComponent } from './components/titleBar.component'
+import { ToggleComponent } from './components/toggle.component'
 import { WindowControlsComponent } from './components/windowControls.component'
 import { RenameTabModalComponent } from './components/renameTabModal.component'
 
+import { AutofocusDirective } from './directives/autofocus.directive'
+
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
 import { Theme } from './api/theme'
@@ -32,23 +39,27 @@ import { Theme } from './api/theme'
 import { StandardTheme, StandardCompactTheme } from './theme'
 import { CoreConfigProvider } from './config'
 
-import 'perfect-scrollbar/dist/css/perfect-scrollbar.css'
+import 'perfect-scrollbar/css/perfect-scrollbar.css'
+import 'ng2-dnd/bundles/style.css'
 
 const PROVIDERS = [
     AppService,
     ConfigService,
     DockingService,
     ElectronService,
+    HomeBaseService,
     HostAppService,
     HotkeysService,
     LogService,
     TabRecoveryService,
     ThemesService,
+    TouchbarService,
     UpdaterService,
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
     { provide: Theme, useClass: StandardCompactTheme, multi: true },
     { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
+    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true }}
 ]
 
 @NgModule({
@@ -57,23 +68,30 @@ const PROVIDERS = [
         BrowserAnimationsModule,
         FormsModule,
         NgbModule.forRoot(),
-        PerfectScrollbarModule.forRoot({
-            suppressScrollX: true,
-        }),
+        PerfectScrollbarModule,
+        DndModule.forRoot(),
     ],
     declarations: [
         AppRootComponent,
+        CheckboxComponent,
         StartPageComponent,
         TabBodyComponent,
         TabHeaderComponent,
         TitleBarComponent,
+        ToggleComponent,
         WindowControlsComponent,
         RenameTabModalComponent,
         SafeModeModalComponent,
+        AutofocusDirective,
     ],
     entryComponents: [
         RenameTabModalComponent,
         SafeModeModalComponent,
+    ],
+    exports: [
+        CheckboxComponent,
+        ToggleComponent,
+        AutofocusDirective,
     ]
 })
 export default class AppModule {
@@ -85,5 +103,11 @@ export default class AppModule {
     }
 }
 
+// PerfectScrollbar fix
+import { fromEvent } from 'rxjs/internal/observable/fromEvent'
+import { merge } from 'rxjs/internal/observable/merge'
+require('rxjs').fromEvent = fromEvent
+require('rxjs').merge = merge
+
 export { AppRootComponent as bootstrap }
 export * from './api'

terminus-core/src/services/app.service.ts

@@ -1,9 +1,9 @@
-import { Subject, AsyncSubject } from 'rxjs'
-import { Injectable, ComponentFactoryResolver, Injector, Optional } from '@angular/core'
-import { DefaultTabProvider } from '../api/defaultTabProvider'
+import { Observable, Subject, AsyncSubject } from 'rxjs'
+import { Injectable, ComponentFactoryResolver, Injector } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
-import { Logger, LogService } from '../services/log.service'
-import { ConfigService } from '../services/config.service'
+import { Logger, LogService } from './log.service'
+import { ConfigService } from './config.service'
+import { HostAppService } from './hostApp.service'
 
 export declare type TabComponentType = new (...args: any[]) => BaseTabComponent
 
@@ -13,13 +13,23 @@ export class AppService {
     activeTab: BaseTabComponent
     lastTabIndex = 0
     logger: Logger
-    tabsChanged$ = new Subject<void>()
-    ready$ = new AsyncSubject<void>()
+
+    private activeTabChange = new Subject<BaseTabComponent>()
+    private tabsChanged = new Subject<void>()
+    private tabOpened = new Subject<BaseTabComponent>()
+    private tabClosed = new Subject<BaseTabComponent>()
+    private ready = new AsyncSubject<void>()
+
+    get activeTabChange$ (): Observable<BaseTabComponent> { return this.activeTabChange }
+    get tabOpened$ (): Observable<BaseTabComponent> { return this.tabOpened }
+    get tabsChanged$ (): Observable<void> { return this.tabsChanged }
+    get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed }
+    get ready$ (): Observable<void> { return this.ready }
 
     constructor (
         private componentFactoryResolver: ComponentFactoryResolver,
-        @Optional() private defaultTabProvider: DefaultTabProvider,
         private config: ConfigService,
+        private hostApp: HostAppService,
         private injector: Injector,
         log: LogService,
     ) {
@@ -29,24 +39,26 @@ export class AppService {
     openNewTab (type: TabComponentType, inputs?: any): BaseTabComponent {
         let componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
         let componentRef = componentFactory.create(this.injector)
-        componentRef.instance.hostView = componentRef.hostView
-        Object.assign(componentRef.instance, inputs || {})
+        let tab = componentRef.instance
+        tab.hostView = componentRef.hostView
+        Object.assign(tab, inputs || {})
 
-        this.tabs.push(componentRef.instance)
-        this.selectTab(componentRef.instance)
-        this.tabsChanged$.next()
+        this.tabs.push(tab)
+        this.selectTab(tab)
+        this.tabsChanged.next()
+        this.tabOpened.next(tab)
 
-        return componentRef.instance
-    }
-
-    openDefaultTab (): void {
-        if (this.defaultTabProvider) {
-            this.defaultTabProvider.openNewTab()
-        }
+        tab.titleChange$.subscribe(title => {
+            if (tab === this.activeTab) {
+                this.hostApp.getWindow().setTitle(title)
+            }
+        })
+        return tab
     }
 
     selectTab (tab: BaseTabComponent) {
         if (this.activeTab === tab) {
+            this.activeTab.emitFocused()
             return
         }
         if (this.tabs.includes(this.activeTab)) {
@@ -55,13 +67,15 @@ export class AppService {
             this.lastTabIndex = null
         }
         if (this.activeTab) {
-            this.activeTab.hasActivity = false
-            this.activeTab.blurred$.next()
+            this.activeTab.clearActivity()
+            this.activeTab.emitBlurred()
         }
         this.activeTab = tab
+        this.activeTabChange.next(tab)
         if (this.activeTab) {
-            this.activeTab.focused$.next()
+            this.activeTab.emitFocused()
         }
+        this.hostApp.getWindow().setTitle(this.activeTab.title)
     }
 
     toggleLastTab () {
@@ -93,6 +107,10 @@ export class AppService {
         }
     }
 
+    emitTabsChanged () {
+        this.tabsChanged.next()
+    }
+
     async closeTab (tab: BaseTabComponent, checkCanClose?: boolean): Promise<void> {
         if (!this.tabs.includes(tab)) {
             return
@@ -100,17 +118,19 @@ export class AppService {
         if (checkCanClose && !await tab.canClose()) {
             return
         }
+        let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
         this.tabs = this.tabs.filter((x) => x !== tab)
         tab.destroy()
-        let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
         if (tab === this.activeTab) {
             this.selectTab(this.tabs[newIndex])
         }
-        this.tabsChanged$.next()
+        this.tabsChanged.next()
+        this.tabClosed.next(tab)
     }
 
     emitReady () {
-        this.ready$.next(null)
-        this.ready$.complete()
+        this.ready.next(null)
+        this.ready.complete()
+        this.hostApp.emitReady()
     }
 }

terminus-core/src/services/config.service.ts

@@ -1,4 +1,4 @@
-import { Subject } from 'rxjs'
+import { Observable, Subject } from 'rxjs'
 import * as yaml from 'js-yaml'
 import * as path from 'path'
 import * as fs from 'fs'
@@ -6,7 +6,6 @@ import { Injectable, Inject } from '@angular/core'
 import { ConfigProvider } from '../api/configProvider'
 import { ElectronService } from './electron.service'
 import { HostAppService } from './hostApp.service'
-import * as Reflect from 'core-js/es7/reflect'
 
 const configMerge = (a, b) => require('deepmerge')(a, b, { arrayMerge: (_d, s) => s })
 
@@ -53,16 +52,18 @@ export class ConfigProxy {
 @Injectable()
 export class ConfigService {
     store: any
-    changed$ = new Subject<void>()
     restartRequested: boolean
+    private changed = new Subject<void>()
     private _store: any
     private path: string
     private defaults: any
     private servicesCache: { [id: string]: Function[] } = null
 
+    get changed$ (): Observable<void> { return this.changed }
+
     constructor (
         electron: ElectronService,
-        hostApp: HostAppService,
+        private hostApp: HostAppService,
         @Inject(ConfigProvider) configProviders: ConfigProvider[],
     ) {
         this.path = path.join(electron.app.getPath('userData'), 'config.yaml')
@@ -77,6 +78,15 @@ export class ConfigService {
             return defaults
         }).reduce(configMerge)
         this.load()
+
+        hostApp.configChangeBroadcast$.subscribe(() => {
+            this.load()
+            this.emitChange()
+        })
+    }
+
+    getDefaults () {
+        return this.defaults
     }
 
     load (): void {
@@ -91,10 +101,22 @@ export class ConfigService {
     save (): void {
         fs.writeFileSync(this.path, yaml.safeDump(this._store), 'utf8')
         this.emitChange()
+        this.hostApp.broadcastConfigChange()
+    }
+
+    readRaw (): string {
+        return yaml.safeDump(this._store)
+    }
+
+    writeRaw (data: string): void {
+        this._store = yaml.safeLoad(data)
+        this.save()
+        this.load()
+        this.emitChange()
     }
 
     emitChange (): void {
-        this.changed$.next()
+        this.changed.next()
     }
 
     requestRestart (): void {
@@ -104,12 +126,11 @@ export class ConfigService {
     enabledServices<T> (services: T[]): T[] {
         if (!this.servicesCache) {
             this.servicesCache = {}
-            let ngModule = Reflect.getMetadata('annotations', window['rootModule'])[0]
+            let ngModule = window['rootModule'].ngInjectorDef
             for (let imp of ngModule.imports) {
-                let module = imp['module'] || imp
-                let annotations = Reflect.getMetadata('annotations', module)
-                if (annotations) {
-                    this.servicesCache[module['pluginName']] = annotations[0].providers.map(provider => {
+                let module = (imp['ngModule'] || imp)
+                if (module.ngInjectorDef && module.ngInjectorDef.providers) {
+                    this.servicesCache[module['pluginName']] = module.ngInjectorDef.providers.map(provider => {
                         return provider['useClass'] || provider
                     })
                 }

terminus-core/src/services/docking.service.ts

@@ -29,18 +29,19 @@ export class DockingService {
         let dockSide = this.config.store.appearance.dock
         let newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
         let fill = this.config.store.appearance.dockFill
+        let [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize()
 
         if (dockSide === 'off') {
             this.hostApp.setAlwaysOnTop(false)
             return
         }
         if (dockSide === 'left' || dockSide === 'right') {
-            newBounds.width = Math.round(fill * display.bounds.width)
+            newBounds.width = Math.max(minWidth, Math.round(fill * display.bounds.width))
             newBounds.height = display.bounds.height
         }
         if (dockSide === 'top' || dockSide === 'bottom') {
             newBounds.width = display.bounds.width
-            newBounds.height = Math.round(fill * display.bounds.height)
+            newBounds.height = Math.max(minHeight, Math.round(fill * display.bounds.height))
         }
         if (dockSide === 'right') {
             newBounds.x = display.bounds.x + display.bounds.width - newBounds.width
@@ -75,12 +76,8 @@ export class DockingService {
         })
     }
 
-    getWindow () {
-        return this.electron.app.window
-    }
-
     repositionWindow () {
-        let [x, y] = this.getWindow().getPosition()
+        let [x, y] = this.hostApp.getWindow().getPosition()
         for (let screen of this.electron.screen.getAllDisplays()) {
             let bounds = screen.bounds
             if (x >= bounds.x && x <= bounds.x + bounds.width && y >= bounds.y && y <= bounds.y + bounds.height) {
@@ -88,6 +85,6 @@ export class DockingService {
             }
         }
         let screen = this.electron.screen.getPrimaryDisplay()
-        this.getWindow().setPosition(screen.bounds.x, screen.bounds.y)
+        this.hostApp.getWindow().setPosition(screen.bounds.x, screen.bounds.y)
     }
 }

terminus-core/src/services/electron.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core'
+import { TouchBar, BrowserWindow } from 'electron'
 
 @Injectable()
 export class ElectronService {
@@ -8,8 +9,11 @@ export class ElectronService {
     dialog: any
     clipboard: any
     globalShortcut: any
+    nativeImage: any
     screen: any
     remote: any
+    TouchBar: typeof TouchBar
+    BrowserWindow: typeof BrowserWindow
     private electron: any
 
     constructor () {
@@ -22,6 +26,9 @@ export class ElectronService {
         this.clipboard = this.electron.clipboard
         this.ipcRenderer = this.electron.ipcRenderer
         this.globalShortcut = this.remote.globalShortcut
+        this.nativeImage = this.remote.nativeImage
+        this.TouchBar = this.remote.TouchBar
+        this.BrowserWindow = this.remote.BrowserWindow
     }
 
     remoteRequire (name: string): any {
@@ -29,6 +36,16 @@ export class ElectronService {
     }
 
     remoteRequirePluginModule (plugin: string, module: string, globals: any): any {
-        return this.remoteRequire(globals.require.resolve(`${plugin}/node_modules/${module}`))
+        return this.remoteRequire(this.remoteResolvePluginModule(plugin, module, globals))
+    }
+
+    remoteResolvePluginModule (plugin: string, module: string, globals: any): any {
+        return globals.require.resolve(`${plugin}/node_modules/${module}`)
+    }
+
+    loseFocus () {
+        if (process.platform === 'darwin') {
+            this.remote.Menu.sendActionToFirstResponder('hide:')
+        }
     }
 }

terminus-core/src/services/homeBase.service.ts

@@ -0,0 +1,43 @@
+import * as os from 'os'
+import { Injectable } from '@angular/core'
+import { ElectronService } from './electron.service'
+import { ConfigService } from './config.service'
+import ua = require('universal-analytics')
+
+@Injectable()
+export class HomeBaseService {
+    appVersion: string
+
+    constructor (
+        private electron: ElectronService,
+        private config: ConfigService,
+    ) {
+        this.appVersion = electron.app.getVersion()
+
+        if (this.config.store.enableAnalytics) {
+            this.enableAnalytics()
+        }
+    }
+
+    openGitHub () {
+        this.electron.shell.openExternal('https://github.com/eugeny/terminus')
+    }
+
+    reportBug () {
+        let body = `Version: ${this.appVersion}\n`
+        body += `Platform: ${os.platform()} ${os.release()}\n\n`
+        let label = {
+            darwin: 'macOS',
+            windows: 'Windows',
+            linux: 'Linux',
+        }[os.platform()]
+        this.electron.shell.openExternal(`https://github.com/eugeny/terminus/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
+    }
+
+    enableAnalytics () {
+        const session = ua('UA-3278102-20')
+        session.set('cd1', this.appVersion)
+        session.set('cd2', process.platform)
+        session.pageview('/').send()
+    }
+}

terminus-core/src/services/hostApp.service.ts

@@ -1,7 +1,8 @@
-import { Subject } from 'rxjs'
+import * as path from 'path'
+import { Observable, Subject } from 'rxjs'
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
-import { ElectronService } from '../services/electron.service'
-import { Logger, LogService } from '../services/log.service'
+import { ElectronService } from './electron.service'
+import { Logger, LogService } from './log.service'
 
 export enum Platform {
     Linux, macOS, Windows,
@@ -18,12 +19,21 @@ export interface Bounds {
 export class HostAppService {
     platform: Platform
     nodePlatform: string
-    preferencesMenu$ = new Subject<void>()
-    ready = new EventEmitter<any>()
     shown = new EventEmitter<any>()
-    secondInstance$ = new Subject<{ argv: string[], cwd: string }>()
-
+    isFullScreen = false
+    private preferencesMenu = new Subject<void>()
+    private secondInstance = new Subject<void>()
+    private cliOpenDirectory = new Subject<string>()
+    private cliRunCommand = new Subject<string[]>()
+    private configChangeBroadcast = new Subject<void>()
     private logger: Logger
+    private windowId: number
+
+    get preferencesMenu$ (): Observable<void> { return this.preferencesMenu }
+    get secondInstance$ (): Observable<void> { return this.secondInstance }
+    get cliOpenDirectory$ (): Observable<string> { return this.cliOpenDirectory }
+    get cliRunCommand$ (): Observable<string[]> { return this.cliRunCommand }
+    get configChangeBroadcast$ (): Observable<void> { return this.configChangeBroadcast }
 
     constructor (
         private zone: NgZone,
@@ -38,27 +48,48 @@ export class HostAppService {
             linux: Platform.Linux
         }[this.nodePlatform]
 
-        electron.ipcRenderer.on('host:preferences-menu', () => this.zone.run(() => this.preferencesMenu$.next()))
+        this.windowId = parseInt(location.search.substring(1))
+        this.logger.info('Window ID:', this.windowId)
 
-        electron.ipcRenderer.on('uncaughtException', ($event, err) => {
+        electron.ipcRenderer.on('host:preferences-menu', () => this.zone.run(() => this.preferencesMenu.next()))
+
+        electron.ipcRenderer.on('uncaughtException', (_$event, err) => {
             this.logger.error('Unhandled exception:', err)
         })
 
+        electron.ipcRenderer.on('host:window-enter-full-screen', () => this.zone.run(() => {
+            this.isFullScreen = true
+        }))
+
+        electron.ipcRenderer.on('host:window-leave-full-screen', () => this.zone.run(() => {
+            this.isFullScreen = false
+        }))
+
         electron.ipcRenderer.on('host:window-shown', () => {
             this.zone.run(() => this.shown.emit())
         })
 
-        electron.ipcRenderer.on('host:second-instance', ($event, argv: string[], cwd: string) => {
-            this.zone.run(() => this.secondInstance$.next({ argv, cwd }))
-        })
+        electron.ipcRenderer.on('host:second-instance', (_$event, argv: any, cwd: string) => this.zone.run(() => {
+            this.logger.info('Second instance', argv)
+            const op = argv._[0]
+            if (op === 'open') {
+                this.cliOpenDirectory.next(path.resolve(cwd, argv.directory))
+            } else if (op === 'run') {
+                this.cliRunCommand.next(argv.command)
+            }
+        }))
 
-        this.ready.subscribe(() => {
-            electron.ipcRenderer.send('app:ready')
-        })
+        electron.ipcRenderer.on('host:config-change', () => this.zone.run(() => {
+            this.configChangeBroadcast.next()
+        }))
     }
 
     getWindow () {
-        return this.electron.app.window
+        return this.electron.BrowserWindow.fromId(this.windowId)
+    }
+
+    newWindow () {
+        this.electron.ipcRenderer.send('app:new-window')
     }
 
     getShell () {
@@ -86,10 +117,6 @@ export class HostAppService {
         this.electron.ipcRenderer.send('window-focus')
     }
 
-    toggleWindow () {
-        this.electron.ipcRenderer.send('window-toggle-focus')
-    }
-
     minimize () {
         this.electron.ipcRenderer.send('window-minimize')
     }
@@ -114,6 +141,24 @@ export class HostAppService {
         this.electron.ipcRenderer.send('window-set-always-on-top', flag)
     }
 
+    setVibrancy (enable: boolean) {
+        document.body.classList.toggle('vibrant', enable)
+        if (this.platform === Platform.macOS) {
+            this.getWindow().setVibrancy(enable ? 'dark' : null)
+        }
+        if (this.platform === Platform.Windows) {
+            this.electron.ipcRenderer.send('window-set-vibrancy', enable)
+        }
+    }
+
+    broadcastConfigChange () {
+        this.electron.ipcRenderer.send('app:config-change')
+    }
+
+    emitReady () {
+        this.electron.ipcRenderer.send('app:ready')
+    }
+
     quit () {
         this.logger.info('Quitting')
         this.electron.app.quit()

terminus-core/src/services/hotkeys.service.ts

@@ -174,6 +174,10 @@ export class HotkeysService {
 @Injectable()
 export class AppHotkeyProvider extends HotkeyProvider {
     hotkeys: IHotkeyDescription[] = [
+        {
+            id: 'new-window',
+            name: 'New window',
+        },
         {
             id: 'toggle-window',
             name: 'Toggle terminal window',

terminus-core/src/services/touchbar.service.ts

@@ -0,0 +1,74 @@
+import { Injectable, Inject, NgZone } from '@angular/core'
+import { TouchBarSegmentedControl, SegmentedControlSegment } from 'electron'
+import { AppService } from './app.service'
+import { ConfigService } from './config.service'
+import { ElectronService } from './electron.service'
+import { HostAppService } from './hostApp.service'
+import { IToolbarButton, ToolbarButtonProvider } from '../api'
+
+@Injectable()
+export class TouchbarService {
+    private tabsSegmentedControl: TouchBarSegmentedControl
+    private tabSegments: SegmentedControlSegment[] = []
+
+    constructor (
+        private app: AppService,
+        private hostApp: HostAppService,
+        @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
+        private config: ConfigService,
+        private electron: ElectronService,
+        private zone: NgZone,
+    ) {
+        app.tabsChanged$.subscribe(() => this.update())
+        app.activeTabChange$.subscribe(() => this.update())
+        app.tabOpened$.subscribe(tab => {
+            tab.titleChange$.subscribe(title => {
+                this.tabSegments[app.tabs.indexOf(tab)].label = this.shortenTitle(title)
+                this.tabsSegmentedControl.segments = this.tabSegments
+            })
+        })
+    }
+
+    update () {
+        let buttons: IToolbarButton[] = []
+        this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
+            buttons = buttons.concat(provider.provide())
+        })
+        buttons.sort((a, b) => (a.weight || 0) - (b.weight || 0))
+        this.tabSegments = this.app.tabs.map(tab => ({
+            label: this.shortenTitle(tab.title),
+        }))
+        this.tabsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
+            segments: this.tabSegments,
+            selectedIndex: this.app.tabs.indexOf(this.app.activeTab),
+            change: (selectedIndex) => this.zone.run(() => {
+                this.app.selectTab(this.app.tabs[selectedIndex])
+            })
+        })
+        let touchBar = new this.electron.TouchBar({
+            items: [
+                this.tabsSegmentedControl,
+                new this.electron.TouchBar.TouchBarSpacer({size: 'flexible'}),
+                new this.electron.TouchBar.TouchBarSpacer({size: 'small'}),
+                ...buttons.map(button => this.getButton(button))
+            ]
+        })
+        this.hostApp.getWindow().setTouchBar(touchBar)
+    }
+
+    private getButton (button: IToolbarButton): Electron.TouchBarButton {
+        return new this.electron.TouchBar.TouchBarButton({
+            label: button.touchBarNSImage ? null : this.shortenTitle(button.touchBarTitle || button.title),
+            icon: button.touchBarNSImage ?
+                this.electron.nativeImage.createFromNamedImage(button.touchBarNSImage, [0, 0, 1]) : null,
+            click: () => this.zone.run(() => button.click()),
+        })
+    }
+
+    private shortenTitle (title: string): string {
+        if (title.length > 15) {
+            title = title.substring(0, 15) + '...'
+        }
+        return title
+    }
+}

terminus-core/src/theme.scss

@@ -14,12 +14,17 @@ $teal:   #5bc0de !default;
 $pink:   #ff5b77 !default;
 $purple: #613d7c !default;
 
+$theme-colors: (
+    "primary":    $blue,
+    "secondary": #394b5d
+);
 
-$body-bg: #1D272D;
-$body-bg2: #131d27;
-$body-bg3: #20333e;
+$content-bg: rgba(39, 49, 60, 0.65); //#1D272D;
+$content-bg-solid: #1D272D;
+$body-bg: #131d27;
+$body-bg2: #20333e;
 
-$body-color: #aaa;
+$body-color: #ccc;
 $font-family-sans-serif: "Source Sans Pro";
 $font-size-base: 14rem / 16;
 
@@ -31,40 +36,42 @@ $btn-secondary-border:           #444;
 //$btn-warning-bg:                 rgba($orange, .5);
 
 
-$nav-tabs-border-color:                       $body-bg2;
+$nav-tabs-border-color:                       $body-bg;
 $nav-tabs-border-width:                       1px;
 $nav-tabs-border-radius:                      0;
-$nav-tabs-link-hover-border-color:            $body-bg2;
+$nav-tabs-link-hover-border-color:            $body-bg;
 $nav-tabs-active-link-hover-color:            $white;
 $nav-tabs-active-link-hover-bg:               $blue;
 $nav-tabs-active-link-hover-border-color:     darken($blue, 30%);
+$nav-pills-border-radius:  0;
 
 $input-bg:                       #111;
-$input-bg-disabled:              #333;
+$input-disabled-bg:              #333;
 
 $input-color:                    $body-color;
 $input-color-placeholder:        #333;
 $input-border-color:             #344;
 //$input-box-shadow:               inset 0 1px 1px rgba($black,.075);
 $input-border-radius:            0;
+$custom-select-border-radius: 0;
 $input-bg-focus:                 $input-bg;
 //$input-border-focus:             lighten($brand-primary, 25%);
 //$input-box-shadow-focus:         $input-box-shadow, rgba($input-border-focus, .6);
 $input-color-focus:              $input-color;
-$input-group-addon-bg:           $body-bg2;
+$input-group-addon-bg:           $body-bg;
 $input-group-addon-border-color: $input-border-color;
 
-$modal-content-bg:               $body-bg;
-$modal-content-border-color:     $body-bg2;
+$modal-content-bg:               $content-bg-solid;
+$modal-content-border-color:     $body-bg;
 $modal-header-border-color:      transparent;
 $modal-footer-border-color:      transparent;
 
-$popover-bg:                     $body-bg2;
+$popover-bg:                     $body-bg;
 
-$dropdown-bg:                    $body-bg2;
+$dropdown-bg:                    $body-bg;
 $dropdown-link-color:            $body-color;
 $dropdown-link-hover-color:      #333;
-$dropdown-link-hover-bg:         $body-bg3;
+$dropdown-link-hover-bg:         $body-bg2;
 //$dropdown-link-active-color:     $component-active-color;
 //$dropdown-link-active-bg:        $component-active-bg;
 $dropdown-link-disabled-color:   #333;
@@ -76,20 +83,22 @@ $list-group-border-color:  rgba(255,255,255,.1);
 $list-group-hover-bg: rgba(255,255,255,.1);
 $list-group-link-active-bg: rgba(255,255,255,.2);
 
+$list-group-action-color: $body-color;
+$list-group-action-bg: rgba(255,255,255,.05);
+$list-group-action-active-bg: $list-group-link-active-bg;
+
 $pre-bg: $dropdown-bg;
 $pre-color: $dropdown-link-color;
 
-$alert-danger-bg: $body-bg2;
+$alert-danger-bg: $body-bg;
 $alert-danger-text: $red;
 $alert-danger-border: $red;
 
+$headings-font-weight: lighter;
+$headings-color: #eee;
 
 @import '~bootstrap/scss/bootstrap.scss';
 
-title-bar {
-    background: $body-bg2;
-}
-
 window-controls {
     svg {
         transition: 0.25s fill;
@@ -105,36 +114,34 @@ window-controls {
     }
 }
 
-$border-color: #141414;
+$border-color: #111;
+
+body {
+    background: $body-bg;
+
+    &.vibrant {
+        background: rgba(0,0,0,.4);
+    }
+}
 
 app-root  {
     &> .content {
-        background: $body-bg2;
-
         .tab-bar {
             .btn-tab-bar {
-                &:not(:hover):not(:active) {
-                    background: $body-bg2;
-                }
-            }
-
-            .drag-space {
-                background: $body-bg2;
+                background: transparent;
+                &:hover { background: rgba(0, 0, 0, .25) !important; }
+                &:active { background: rgba(0, 0, 0, .5) !important; }
             }
 
             &>.tabs {
-                &:empty {
-                    background: $body-bg2;
-                }
-
                 tab-header {
-                    background: $body-bg2;
                     border-left: 1px solid transparent;
                     border-right: 1px solid transparent;
-                    border-top: 1px solid transparent;
+
+                    transition: 0.25s all;
 
                     .index {
-                        color: #555;
+                        color: #888;
                     }
 
                     button {
@@ -146,8 +153,13 @@ app-root  {
                         &:active { background: $button-active-bg !important; }
                     }
 
+                    .progressbar {
+                        background: $green;
+                    }
+
                     &.active {
-                        background: $body-bg;
+                        color: white;
+                        background: $content-bg;
                         border-left: 1px solid $border-color;
                         border-right: 1px solid $border-color;
                     }
@@ -156,54 +168,59 @@ app-root  {
         }
 
         &.tabs-on-top .tab-bar {
-            border-bottom: 1px solid $border-color;
+            &>.background {
+                border-bottom: 1px solid $border-color;
+            }
 
             tab-header {
-                border-top: 1px solid transparent;
                 border-bottom: 1px solid $border-color;
-                margin-bottom: -1px;
 
                 &.active {
-                    border-top: 1px solid $teal;
                     border-bottom-color: transparent;
                 }
 
                 &.has-activity:not(.active) {
-                    border-top: 1px solid $green;
+                    background: linear-gradient(to bottom, rgba(208, 0, 0, 0) 95%, #1aa99c 100%);
                 }
             }
         }
 
         &:not(.tabs-on-top) .tab-bar {
-            border-top: 1px solid $border-color;
+            &>.background {
+                border-top: 1px solid $border-color;
+            }
 
             tab-header {
-                border-bottom: 1px solid transparent;
                 border-top: 1px solid $border-color;
-                margin-top: -1px;
 
                 &.active {
-                    border-bottom: 1px solid $teal;
                     margin-top: -1px;
                 }
 
                 &.has-activity:not(.active) {
-                    border-bottom: 1px solid $green;
+                    background: linear-gradient(to top, rgba(208, 0, 0, 0) 95%, #1aa99c 100%);
                 }
             }
         }
     }
+
+    &.platform-win32, &.platform-linux {
+        border: 1px solid #111;
+        &>.content .tab-bar .tabs tab-header:first-child {
+            border-left: none;
+        }
+    }
 }
 
 tab-body {
-    background: $body-bg;
+    background: $content-bg;
 }
 
 settings-tab > ngb-tabset {
-    border-right: 1px solid $body-bg2;
+    border-right: 1px solid $body-bg;
 
     & > .nav {
-        background: $body-bg3;
+        background: rgba(0, 0, 0, 0.25);
 
         & > .nav-item > .nav-link {
             border-left: none;
@@ -231,7 +248,7 @@ settings-tab > ngb-tabset {
 
 multi-hotkey-input {
     .item {
-        background: $body-bg3;
+        background: $body-bg2;
         border: 1px solid $blue;
         border-radius: 3px;
         margin-right: 5px;
@@ -241,7 +258,7 @@ multi-hotkey-input {
 
             .stroke {
                 padding: 0 6px;
-                border-right: 1px solid $body-bg;
+                border-right: 1px solid $content-bg;
             }
         }
 
@@ -256,8 +273,8 @@ multi-hotkey-input {
     }
 
     .add, .item .body, .item .remove {
-        &:hover { background: darken($body-bg3, 5%); }
-        &:active { background: darken($body-bg3, 15%); }
+        &:hover { background: darken($body-bg2, 5%); }
+        &:active { background: darken($body-bg2, 15%); }
     }
 }
 
@@ -270,7 +287,7 @@ hotkey-input-modal {
         height: 55px;
 
         .stroke {
-            background: $body-bg3;
+            background: $body-bg2;
             border: 1px solid $blue;
             border-radius: 3px;
             margin-right: 10px;
@@ -332,3 +349,19 @@ ngb-tabset .tab-content {
         margin-left: 10px;
     }
 }
+
+select.form-control {
+  -webkit-appearance: none;
+  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='24' height='24' viewBox='0 0 24 24'><path fill='#444' d='M7.406 7.828l4.594 4.594 4.594-4.594 1.406 1.406-6 6-6-6z'></path></svg>");
+  background-position: 100% 50%;
+  background-repeat: no-repeat;
+  padding-right: 30px;
+}
+
+checkbox i.on {
+    color: $blue;
+}
+
+toggle.active .body .toggle {
+    background: $blue;
+}

terminus-core/webpack.config.js

@@ -6,6 +6,7 @@ module.exports = {
   entry: 'src/index.ts',
   devtool: 'source-map',
   context: __dirname,
+  mode: 'development',
   output: {
     path: path.resolve(__dirname, 'dist'),
     filename: 'index.js',
@@ -13,21 +14,24 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]',
   },
+  mode: process.env.DEV ? 'development' : 'production',
   resolve: {
     modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
     extensions: ['.ts', '.js'],
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.ts$/,
-        loader: 'awesome-typescript-loader',
-        options: {
-          configFileName: path.resolve(__dirname, 'tsconfig.json'),
-          typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-          paths: {
-            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+        use: {
+          loader: 'awesome-typescript-loader',
+          options: {
+            configFileName: path.resolve(__dirname, 'tsconfig.json'),
+            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
+            paths: {
+              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+              "*": [path.resolve(__dirname, '../app/node_modules/*')],
+            }
           }
         }
       },
@@ -36,6 +40,7 @@ module.exports = {
       { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ },
       { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ },
       { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] },
+      { test: /\.svg/, use: ['svg-inline-loader'] },
     ]
   },
   externals: [

terminus-core/yarn.lock

@@ -20,16 +20,47 @@
   dependencies:
     "@types/node" "*"
 
+ajv@^5.1.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
 argparse@^1.0.7:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
     sprintf-js "~1.0.2"
 
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 async@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
 
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.6.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+
 axios@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
@@ -37,6 +68,12 @@ axios@0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  dependencies:
+    tweetnacl "^0.14.3"
+
 bluebird-lst@^1.0.2, bluebird-lst@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.3.tgz#cc56c18660eff0a0b86e2c33d1659618f7005158"
@@ -47,31 +84,76 @@ bluebird@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
-bootstrap@4.0.0-alpha.6:
-  version "4.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8"
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
   dependencies:
-    jquery ">=1.9.1"
-    tether "^1.4.0"
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+bootstrap@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
+combined-stream@1.0.6, combined-stream@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
 core-js@^2.4.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
 
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
 cycle@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
 debug@^2.4.5:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
+debug@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 debug@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
@@ -82,6 +164,17 @@ deepmerge@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.1.tgz#c053bf06fd7276f1994f70c09a0760cb61a56237"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 electron-builder-http@~19.27.5:
   version "19.27.5"
   resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-19.27.5.tgz#800865df2e618ffab9e5b3b895c15b4ce7fd7f17"
@@ -115,16 +208,48 @@ esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
+extend@~3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
 eyes@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
 
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
 follow-redirects@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.4.tgz#355e8f4d16876b43f577b0d5ce2668b9723214ea"
   dependencies:
     debug "^2.4.5"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
 fs-extra-p@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.4.0.tgz#729c601c4f4c701328921adc7cfe9b236f100660"
@@ -140,22 +265,60 @@ fs-extra@^4.0.0:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+hoek@4.x.x:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 is-buffer@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
-isstream@0.1.x:
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+isstream@0.1.x, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-jquery@>=1.9.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
-
 js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
@@ -163,12 +326,37 @@ js-yaml@^3.9.0, js-yaml@^3.9.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
 lazy-val@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.2.tgz#d9b07fb1fce54cbc99b3c611de431b83249369b6"
@@ -181,19 +369,88 @@ macaddress@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
+mime-db@~1.35.0:
+  version "1.35.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
+
+mime-types@^2.1.12, mime-types@~2.1.17:
+  version "2.1.19"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
+  dependencies:
+    mime-db "~1.35.0"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-ngx-perfect-scrollbar@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.0.0.tgz#f1e19449fa97d7f16e1ceb1fe1739e4bb646bebe"
-  dependencies:
-    perfect-scrollbar "~0.6.0"
+ng2-dnd@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/ng2-dnd/-/ng2-dnd-5.0.2.tgz#862278ac7dedfa14f5783bbf34014d5d73dfefb4"
 
-perfect-scrollbar@~0.6.0:
-  version "0.6.16"
-  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-0.6.16.tgz#b1d61a5245cf3962bb9a8407a3fc669d923212fc"
+ngx-perfect-scrollbar@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-6.0.0.tgz#92b51957c04ed6a6d416beca2707bab005667b68"
+  dependencies:
+    perfect-scrollbar "^1.3.0"
+    resize-observer-polyfill "^1.4.0"
+
+oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+perfect-scrollbar@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.3.0.tgz#61da56f94b58870d8e0a617bce649cee17d1e3b2"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+qs@~6.5.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
+request@2.86.0:
+  version "2.86.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.86.0.tgz#2b9497f449b0a32654c081a5cf426bbfb5bf5b69"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+resize-observer-polyfill@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
 sax@^1.2.1:
   version "1.2.4"
@@ -203,6 +460,12 @@ semver@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
 source-map-support@^0.4.16:
   version "0.4.17"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.17.tgz#6f2150553e6375375d0ccb3180502b78c18ba430"
@@ -217,17 +480,48 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
+sshpk@^1.7.0:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+    safer-buffer "^2.0.2"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
 
-tether@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
+tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
 
-typescript@^2.4.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+universal-analytics@^0.4.17:
+  version "0.4.17"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.17.tgz#b57a07e37446ebe4f32872b2152a44cbc5cc4b73"
+  dependencies:
+    debug "^3.0.0"
+    request "2.86.0"
+    uuid "^3.0.0"
 
 universalify@^0.1.0:
   version "0.1.1"
@@ -239,6 +533,18 @@ uuid-1345@^0.99.6:
   dependencies:
     macaddress "^0.2.7"
 
+uuid@^3.0.0, uuid@^3.1.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 winston@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"

terminus-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.0-alpha.36",
+  "version": "1.0.0-alpha.48",
   "description": "Terminus' plugin manager",
   "keywords": [
     "terminus-builtin-plugin"

terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug

@@ -19,7 +19,7 @@ h3 Installed
                 .d-flex.flex-column.align-items-end.mr-3
                     div {{plugin.version}}
                     small.text-muted {{plugin.author}}
-                button.btn.btn-outline-primary(
+                button.btn.btn-secondary.ml-2(
                     *ngIf='npmInstalled && knownUpgrades[plugin.name]',
                     (click)='upgradePlugin(plugin)',
                     [disabled]='busy[plugin.name] != undefined'
@@ -27,19 +27,19 @@ h3 Installed
                     i.fa.fa-fw.fa-arrow-up(*ngIf='busy[plugin.name] != BusyState.Installing')
                     i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
                     span Upgrade ({{knownUpgrades[plugin.name].version}})
-                button.btn.btn-outline-danger(
+                button.btn.btn-secondary.ml-2(
                     (click)='uninstallPlugin(plugin)', 
                     *ngIf='!plugin.isBuiltin && npmInstalled',
                     [disabled]='busy[plugin.name] != undefined'
                 )
                     i.fa.fa-fw.fa-trash-o(*ngIf='busy[plugin.name] != BusyState.Uninstalling')
                     i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling')
-                button.btn.btn-outline-danger(
+                button.btn.btn-secondary.ml-2(
                     *ngIf='config.store.pluginBlacklist.includes(plugin.name)',
                     (click)='enablePlugin(plugin)'
                 )
                     i.fa.fa-fw.fa-play
-                button.btn.btn-outline-primary(
+                button.btn.btn-secondary.ml-2(
                     *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
                     (click)='disablePlugin(plugin)'
                 )
@@ -60,9 +60,10 @@ div(*ngIf='npmInstalled')
     h3.mt-4 Available
 
     .input-group.mb-4
-        .input-group-addon
-            i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='!availablePluginsReady')
-            i.fa.fa-fw.fa-search(*ngIf='availablePluginsReady')
+        .input-group-prepend
+            .input-group-text
+                i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='!availablePluginsReady')
+                i.fa.fa-fw.fa-search(*ngIf='availablePluginsReady')
         input.form-control(
             type='text',
             '[(ngModel)]'='_1',
@@ -83,7 +84,7 @@ div(*ngIf='npmInstalled')
                         div {{plugin.version}}
                         small.text-muted {{plugin.author}}
                             i.fa.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official')
-                    button.btn.btn-outline-primary(
+                    button.btn.btn-primary(
                         (click)='installPlugin(plugin)',
                         [disabled]='busy[plugin.name] != undefined'
                     )

terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts

@@ -1,4 +1,5 @@
 import { BehaviorSubject, Observable } from 'rxjs'
+import { debounceTime, distinctUntilChanged, first, tap, flatMap } from 'rxjs/operators'
 import * as semver from 'semver'
 
 import { Component, Input } from '@angular/core'
@@ -33,15 +34,18 @@ export class PluginsSettingsTabComponent {
 
     ngOnInit () {
         this.availablePlugins$ = this.availablePluginsQuery$
-            .debounceTime(200)
-            .distinctUntilChanged()
-            .flatMap(query => {
-                this.availablePluginsReady = false
-                return this.pluginManager.listAvailable(query).do(() => {
-                    this.availablePluginsReady = true
+            .asObservable()
+            .pipe(
+                debounceTime(200),
+                distinctUntilChanged(),
+                flatMap(query => {
+                    this.availablePluginsReady = false
+                    return this.pluginManager.listAvailable(query).pipe(tap(() => {
+                        this.availablePluginsReady = true
+                    }))
                 })
-            })
-        this.availablePlugins$.first().subscribe(available => {
+            )
+        this.availablePlugins$.pipe(first()).subscribe(available => {
             for (let plugin of this.pluginManager.installedPlugins) {
                 this.knownUpgrades[plugin.name] = available.find(x => x.name === plugin.name && semver.gt(x.version, plugin.version))
             }

terminus-plugin-manager/src/services/pluginManager.service.ts

@@ -2,7 +2,8 @@ import * as path from 'path'
 import * as fs from 'mz/fs'
 import { exec } from 'mz/child_process'
 import axios from 'axios'
-import { Observable } from 'rxjs'
+import { Observable, from } from 'rxjs'
+import { map } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { Logger, LogService, ConfigService, HostAppService, Platform } from 'terminus-core'
 
@@ -29,6 +30,7 @@ export class PluginManagerService {
     userPluginsPath: string = (window as any).userPluginsPath
     installedPlugins: IPluginInfo[] = (window as any).installedPlugins
     npmPath: string
+    private envPath: string
 
     constructor (
         log: LogService,
@@ -41,11 +43,13 @@ export class PluginManagerService {
 
     async detectPath () {
         this.npmPath = this.config.store.npm
+        this.envPath = process.env.PATH
         if (await fs.exists(this.npmPath)) {
             return
         }
         if (this.hostApp.platform !== Platform.Windows) {
-            let searchPaths = (await exec('bash -c -l "echo $PATH"'))[0].toString().trim().split(':')
+            this.envPath = (await exec('$SHELL -c -i \'echo $PATH\''))[0].toString().trim()
+            let searchPaths = this.envPath.split(':')
             for (let searchPath of searchPaths) {
                 if (await fs.exists(path.join(searchPath, 'npm'))) {
                     this.logger.debug('Found npm in', searchPath)
@@ -59,7 +63,7 @@ export class PluginManagerService {
     async isNPMInstalled (): Promise<boolean> {
         await this.detectPath()
         try {
-            await exec(`${this.npmPath} -v`)
+            await exec(`${this.npmPath} -v`, { env: this.getEnv() })
             return true
         } catch (_) {
             return false
@@ -67,11 +71,10 @@ export class PluginManagerService {
     }
 
     listAvailable (query?: string): Observable<IPluginInfo[]> {
-        return Observable
-            .fromPromise(
-                axios.get(`https://www.npmjs.com/-/search?text=keywords:${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=1000`)
-            )
-            .map(response => response.data.objects.map(item => ({
+        return from(
+            axios.get(`https://api.npms.io/v2/search?q=keywords%3A${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=250`, {})
+        ).pipe(
+            map(response => response.data.results.map(item => ({
                 name: item.package.name.substring(NAME_PREFIX.length),
                 packageName: item.package.name,
                 description: item.package.description,
@@ -79,18 +82,23 @@ export class PluginManagerService {
                 homepage: item.package.links.homepage,
                 author: (item.package.author || {}).name,
                 isOfficial: item.package.publisher.username === OFFICIAL_NPM_ACCOUNT,
-            })))
-            .map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX)))
+            }))),
+            map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX))),
+        )
     }
 
     async installPlugin (plugin: IPluginInfo) {
-        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" install ${plugin.packageName}@${plugin.version}`)
+        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" install ${plugin.packageName}@${plugin.version}`, { env: this.getEnv() })
         this.installedPlugins = this.installedPlugins.filter(x => x.packageName !== plugin.packageName)
         this.installedPlugins.push(plugin)
     }
 
     async uninstallPlugin (plugin: IPluginInfo) {
-        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" remove ${plugin.packageName}`)
+        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" remove ${plugin.packageName}`, { env: this.getEnv() })
         this.installedPlugins = this.installedPlugins.filter(x => x.packageName !== plugin.packageName)
     }
+
+    private getEnv (): any {
+        return Object.assign(process.env, { PATH: this.envPath })
+    }
 }

terminus-plugin-manager/webpack.config.js

@@ -13,21 +13,24 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]',
   },
+  mode: process.env.DEV ? 'development' : 'production',
   resolve: {
     modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
     extensions: ['.ts', '.js'],
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.ts$/,
-        loader: 'awesome-typescript-loader',
-        query: {
-          configFileName: path.resolve(__dirname, 'tsconfig.json'),
-          typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-          paths: {
-            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+        use: {
+          loader: 'awesome-typescript-loader',
+          query: {
+            configFileName: path.resolve(__dirname, 'tsconfig.json'),
+            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
+            paths: {
+              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+              "*": [path.resolve(__dirname, '../app/node_modules/*')],
+            }
           }
         }
       },

terminus-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.0-alpha.36",
+  "version": "1.0.0-alpha.48",
   "description": "Terminus terminal settings page",
   "keywords": [
     "terminus-builtin-plugin"

terminus-settings/src/buttonProvider.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core'
+import { DomSanitizer } from '@angular/platform-browser'
 import { ToolbarButtonProvider, IToolbarButton, AppService, HostAppService } from 'terminus-core'
 
 import { SettingsTabComponent } from './components/settingsTab.component'
@@ -8,6 +9,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
     constructor (
         hostApp: HostAppService,
         private app: AppService,
+        private domSanitizer: DomSanitizer,
     ) {
         super()
         hostApp.preferencesMenu$.subscribe(() => this.open())
@@ -15,8 +17,9 @@ export class ButtonProvider extends ToolbarButtonProvider {
 
     provide (): IToolbarButton[] {
         return [{
-            icon: 'sliders',
+            icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/cog.svg')),
             title: 'Settings',
+            touchBarNSImage: 'NSTouchBarComposeTemplate',
             weight: 10,
             click: () => this.open(),
         }]

terminus-settings/src/components/hotkeyInputModal.component.ts

@@ -1,4 +1,5 @@
-import { Component, Input, trigger, transition, style, animate } from '@angular/core'
+import { Component, Input } from '@angular/core'
+import { trigger, transition, style, animate } from '@angular/animations'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subscription } from 'rxjs'
 import { HotkeysService } from 'terminus-core'

terminus-settings/src/components/multiHotkeyInput.component.scss

@@ -1,5 +1,10 @@
 :host {
     display: flex;
+    flex-wrap: nowrap;
+
+    &:hover .add {
+      display: initial;
+    }
 }
 
 .item {
@@ -22,4 +27,9 @@
 
 .add {
     flex: auto;
+    display: none;
+
+    &:first-child {
+        display: block;
+    }
 }