Merge pull request #3 from GitSquared/master

yet another update from main repo

Author: Phuntsok Drak-pa

.travis.yml

@@ -9,6 +9,8 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib        ; fi
 
 before_script:
+  - npm install snyk
+  - npm run snyk-protect
   - npm install
 
 script:

README.md

@@ -5,14 +5,16 @@
 </p>
 
 
-Download | Linux & MacOS | Windows | Dependencies | Build system | Source
---------- | ------------- | ------- | ------------ | ------------ | ------
+Download | Linux & macOS | Windows | Dependencies | Build system | Source
+-------- | ------------- | ------- | ------------ | ------------ | ------
 [![Release Badge](https://badgen.net/github/release/GitSquared/edex-ui)](https://github.com/GitSquared/edex-ui/releases) | [![Build Status](https://travis-ci.org/GitSquared/edex-ui.svg?branch=master)](https://travis-ci.org/GitSquared/edex-ui) | [![Build status](https://ci.appveyor.com/api/projects/status/leb069bro8gwocu7/branch/master?svg=true)](https://ci.appveyor.com/project/GitSquared/edex-ui/branch/master) | [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=GitSquared/edex-ui)](https://dependabot.com) | [![Known Vulnerabilities](https://snyk.io/test/github/GitSquared/edex-ui/badge.svg?targetFile=package.json)](https://snyk.io/test/github/GitSquared/edex-ui?targetFile=package.json) | [![Known Vulnerabilities](https://snyk.io/test/github/GitSquared/edex-ui/badge.svg?targetFile=src%2Fpackage.json)](https://snyk.io/test/github/GitSquared/edex-ui?targetFile=src%2Fpackage.json)
 
 eDEX-UI is a fullscreen desktop application resembling a sci-fi computer interface, heavily inspired from [DEX-UI](https://github.com/seenaburns/dex-ui) and the [TRON Legacy movie effects](https://web.archive.org/web/20170511000410/http://jtnimoy.com/blogs/projects/14881671). It runs the shell of your choice in a real terminal, and displays live information about your system. It was made to be used on large touchscreens but will work nicely on a regular desktop computer or perhaps a tablet PC or one of those funky 360° laptops with touchscreens.
 
 I had no ideas for a name so i took DEX-UI and added a "e" for Electron. Deal with it.
 
+([Official ArchLinux AUR package](https://aur.archlinux.org/packages/edex-ui/) maintained by [@JesusCrie](https://github.com/JesusCrie))
+
 ## Screenshots
 ![Default screenshot](https://github.com/GitSquared/edex-ui/raw/master/media/screenshot_default.png)
 
@@ -28,9 +30,9 @@ _([fx](https://github.com/antonmedv/fx) showing the results of a [ipapi](https:/
 
 ## Q&A
 #### What OS can this thing run on?
-Currently Windows, the latest MacOS and any linux distro that can run Chromium (AppImage package).
+Currently Windows, the latest macOS and any Linux distro that can run Chromium (AppImage package).
 #### Is this a real terminal?
-Yes. By default, eDEX runs bash on linux and Powershell on Windows, but you can change that to any command in the settings.json file.
+Yes. By default, eDEX runs bash on Linux and Powershell on Windows, but you can change that to any command in the settings.json file.
 #### I don't like the colors/the keyboard layout is not right for me!
 We got you covered! Check the [repo's Wiki](https://github.com/GitSquared/edex-ui/wiki) for in-depth information about customizing eDEX.
 #### Why is there a keyboard?
@@ -45,16 +47,18 @@ Seenaburns' DEX-UI was created _"as an experiment or an art piece, not distribut
 - [Linux Uprising Blog](https://www.linuxuprising.com/2018/11/edex-ui-fully-functioning-sci-fi.html)
 - [My post on r/unixporn](https://www.reddit.com/r/unixporn/comments/9ysbx7/oc_a_little_project_that_ive_been_working_on/)
 - [Korben article (in french)](https://korben.info/une-interface-futuriste-pour-vos-ecrans-tactiles.html)
+- [Hacker News](https://news.ycombinator.com/item?id=18509828)
+- [This tweet that made me smile](https://twitter.com/mikemaccana/status/1065615451940667396)
 
 
 ## Useful commands for the nerds
 #### Starting from source:
-on *nix systems (You'll need the Xcode command line tools on MacOS):
+on *nix systems (You'll need the Xcode command line tools on macOS):
 - clone the repository
 - `npm run install-linux`
 - `npm start`
 
-on windows:
+on Windows:
 - start cmd or powershell **as administrator**
 - clone the repository
 - `npm run install-windows`

appveyor.yml

@@ -4,7 +4,7 @@ pull_requests:
 install:
 - ps: Install-Product node 8
 build_script:
-- cmd: npm install && npm install 7zip-bin-win && npm run build-windows
+- cmd: npm install snyk && npm run snyk-protect && npm install && npm install 7zip-bin-win && npm run build-windows
 test: off
 artifacts:
   - path: "dist\\eDEX-UI Windows Installer.exe"

package-lock.json

@@ -26,8 +26,7 @@
     "postbuild-linux": "rm -R prebuild-src",
     "postbuild-darwin": "rm -R prebuild-src",
     "postbuild-windows": "rmdir /S /Q prebuild-src",
-    "snyk-protect": "snyk protect",
-    "prepare": "npm run snyk-protect"
+    "snyk-protect": "snyk protect"
   },
   "repository": {
     "type": "git",
@@ -108,8 +107,8 @@
     "electron-rebuild": "1.8.2",
     "node-abi": "2.5.0",
     "node-json-minify": "1.0.0",
-    "snyk": "^1.108.2",
-    "uglify-es": "3.3.10"
+    "snyk": "^1.110.1",
+    "uglify-es": "3.3.9"
   },
   "snyk": true
 }

package.json

@@ -80,7 +80,14 @@ fs.readdirSync(innerFontsDir).forEach((e) => {
 
 function createWindow(settings) {
     signale.info("Creating window...");
-    let {x, y, width, height} = electron.screen.getPrimaryDisplay().bounds;
+
+    let display;
+    if (!isNaN(settings.monitor)) {
+        display = electron.screen.getAllDisplays()[settings.monitor] || electron.screen.getPrimaryDisplay();
+    } else {
+        display = electron.screen.getPrimaryDisplay();
+    }
+    let {x, y, width, height} = display.bounds;
     width++; height++;
     win = new BrowserWindow({
         title: "eDEX-UI",

src/_boot.js

@@ -120,6 +120,11 @@ div.keyboard_key > h3 {
     right: 0.278vh;
 }
 
+div.keyboard_key > h5 {
+    top: 0.278vh;
+    right: 0.278vh;
+}
+
 div.keyboard_key > h4, div.keyboard_row > .keyboard_key:last-child > *:not(h1), div.keyboard_row > .keyboard_key:first-child > *:not(h1) {
     opacity: 0;
     position: absolute;