diff --git a/app/css/index.css b/app/css/index.css index 0ecb872..99a02db 100644 --- a/app/css/index.css +++ b/app/css/index.css @@ -204,14 +204,14 @@ canvas{ .zoom{ position: absolute; top: 0; - left:0; + left:20; } .zoom2{ position: absolute; - top: 6%; - left:0; + top: 4%; + left:20; } @@ -268,6 +268,11 @@ i.fa.fa-minus:hover { cursor: pointer; } +i.fa.fa-plus:hover { + color: #23ea09; + cursor: pointer; +} + .close { background-color: rgba(88, 88, 88,.5); line-height: 0; diff --git a/app/shapes.js b/app/shapes.js index 23bf8e6..ac3f367 100644 --- a/app/shapes.js +++ b/app/shapes.js @@ -622,15 +622,15 @@ console.log(windowPos) //shell.openExternal("file://"+screenshotPath) setTimeout(function(){ addDragImage("file://"+screenshotPath) - console.log("file://"+screenshotPath) + $(".main-container").css("background"," rgba(171, 163, 163, 0.17)"); + $('.screen-cap-button').show() + $('.floating-canvas').show() },100) }) }) - $(".main-container").css("background"," rgba(171, 163, 163, 0.17)"); - $('.screen-cap-button').show() - $('.floating-canvas').show() + diff --git a/main.js b/main.js index ba8352e..1d8710a 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,7 @@ 'use strict'; const electron = require('electron'); -const {app} = electron; +const {app, protocol} = electron; const {BrowserWindow} = electron; const {globalShortcut} = electron; const {ipcRenderer} = electron; @@ -10,13 +10,15 @@ const {webContents} = electron; var mainWindow = null; app.commandLine.appendSwitch('--disable-http-cache'); +app.disableHardwareAcceleration() app.on('ready', function() { + protocol.unregisterProtocol('', () => { mainWindow = new BrowserWindow({ frame: false, - height: 100, - //resizable: true, - width: 100, + height: 500, + //resizable: false, + width: 500, transparent:true }); mainWindow.loadURL('file://' + __dirname + '/index.html'); @@ -24,7 +26,7 @@ app.on('ready', function() { - + }) }); diff --git a/package-lock.json b/package-lock.json index cded8ae..b4dfd11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -152,9 +152,9 @@ } }, "asar-integrity": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asar-integrity/-/asar-integrity-0.2.3.tgz", - "integrity": "sha512-c+oMuxlpKRDv9Kv6WdjbnkySfSYATAmW+cvy8NIdMg9twY9RMvSdvOoPssroWlTpSra1qX9vLew2ROpV4jQm7w==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asar-integrity/-/asar-integrity-0.2.4.tgz", + "integrity": "sha512-6UDOmyl4RUo8i/0Sem/UKFJ70XZrXLCDQcILTbjTjAKZrSA3JbXVnWRFi2ZFEbeZxQ2LVCc3CWHnDlqj2AyVXg==", "dev": true, "requires": { "bluebird-lst": "1.0.5", @@ -173,15 +173,6 @@ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", "dev": true }, - "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", - "dev": true, - "requires": { - "lodash": "4.17.4" - } - }, "async-exit-hook": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", @@ -347,26 +338,25 @@ "dev": true }, "builder-util": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-3.5.0.tgz", - "integrity": "sha512-M6ERwe5xdMqTOwdD5k3gUb0rIO+qOgHxM7vk3AdcAHqXFmZv4Jxd4Z4Q254aYmwk9cXuUqCw5wEuE484Y0X1QQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-4.1.1.tgz", + "integrity": "sha512-h07vOUQfdJbJsEAqVSyCHiwxaFgqudIAIjx5rkETO5oFv6kZR1hq6fcljimbkPzP6CmALcTEAzkVqBvGQZw5Fw==", "dev": true, "requires": { "7zip-bin": "2.3.4", "bluebird-lst": "1.0.5", - "builder-util-runtime": "3.5.0", + "builder-util-runtime": "4.0.0", "chalk": "2.3.0", "debug": "3.1.0", "fs-extra-p": "4.5.0", "ini": "1.3.5", - "is-ci": "1.0.10", + "is-ci": "1.1.0", "js-yaml": "3.10.0", "lazy-val": "1.0.3", - "node-emoji": "1.8.1", "semver": "5.4.1", "source-map-support": "0.5.0", "stat-mode": "0.2.2", - "temp-file": "3.0.0", + "temp-file": "3.1.0", "tunnel-agent": "0.6.0" }, "dependencies": { @@ -388,9 +378,9 @@ } }, "builder-util-runtime": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-3.5.0.tgz", - "integrity": "sha512-OFLNRmhvB9Vt64CtRm4et3KvWConazu3RnLPkL+xFtATIDbNWhuzg+V7i684vzgaVWRD+roP+u8gzg/92pOiJA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.0.0.tgz", + "integrity": "sha512-Nvwf3H+9wSknQRVdMMhHvoEhg90+tj7M3+UD7e6be0gRCtpAK2jNm6t/wygCTMbi5/YoFbEjLFzBUqgsN/ZePQ==", "dev": true, "requires": { "bluebird-lst": "1.0.5", @@ -488,17 +478,6 @@ "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", "dev": true }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -755,29 +734,17 @@ "dev": true }, "dmg-builder": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-2.1.10.tgz", - "integrity": "sha512-FzeaL2K10+DakEMNZw0ezkoahhpWJJKM/1HAlGaUcrCbWhWKsA1MZA5LhSRYnVeDqwpIlLAUu7Y+zdHlSEKajA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-3.1.0.tgz", + "integrity": "sha512-jxf2NbiM1Q6xeIajvaz/flsiik4FGU79/sLTia6xzoCRMdhBoerJlOLGOTrt/xuU0I3gvY0D2kHB58SgAZRs8Q==", "dev": true, "requires": { "bluebird-lst": "1.0.5", - "builder-util": "3.5.0", - "debug": "3.1.0", + "builder-util": "4.1.1", "fs-extra-p": "4.5.0", "iconv-lite": "0.4.19", "js-yaml": "3.10.0", "parse-color": "1.0.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } } }, "dot-prop": { @@ -823,9 +790,9 @@ "dev": true }, "electron": { - "version": "1.7.9", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.9.tgz", - "integrity": "sha1-rdVOn4+D7QL2UZ7BATX2mLGTNs8=", + "version": "1.7.10", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.10.tgz", + "integrity": "sha1-Oj6D2WX9f6/kc76N349HJWG2JT0=", "dev": true, "requires": { "@types/node": "7.0.50", @@ -834,24 +801,24 @@ } }, "electron-builder": { - "version": "19.50.0", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-19.50.0.tgz", - "integrity": "sha512-EmQvn8YBxph++TYMoyqivxhnKr2dDBmcd0B7S7nHO+JWaqakaziQNjLAU2WxWgmvGkcTHdbV3w5p1PXtgHq4cA==", + "version": "19.52.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-19.52.1.tgz", + "integrity": "sha512-X6AwSpkoRlGQ2lFmsFt+1cpoCX/KPtokc9hsmDCI1KiNiiPiT1Qo6+JxAsBHkbMGGfyiIWPD/xbX4FZv2q8E0A==", "dev": true, "requires": { "bluebird-lst": "1.0.5", - "builder-util": "3.5.0", - "builder-util-runtime": "3.5.0", + "builder-util": "4.1.1", + "builder-util-runtime": "4.0.0", "chalk": "2.3.0", - "electron-builder-lib": "19.50.0", + "electron-builder-lib": "19.52.1", "electron-download-tf": "4.3.4", "fs-extra-p": "4.5.0", - "is-ci": "1.0.10", + "is-ci": "1.1.0", "lazy-val": "1.0.3", - "read-config-file": "1.2.2", + "read-config-file": "2.0.1", "sanitize-filename": "1.6.1", "update-notifier": "2.3.0", - "yargs": "10.0.3" + "yargs": "10.1.1" }, "dependencies": { "debug": { @@ -929,36 +896,36 @@ } }, "electron-builder-lib": { - "version": "19.50.0", - "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-19.50.0.tgz", - "integrity": "sha512-g/D/eW8/ZRO9pv0KVVvHChSj6TyCvgTTHunGCzIa2LUcLEElx0ZvgdUddALsYCIyH9SmpezDFV2PvLo6S9Yp0g==", + "version": "19.52.1", + "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-19.52.1.tgz", + "integrity": "sha512-W3kQmVK/Th2F9KhEDS6PuDhfn6RVEu7D93j+0gKv7cO7ewKzQpeoNp6HbSEIainptf4Qpje8xswtCVjB/onFAw==", "dev": true, "requires": { "7zip-bin": "2.3.4", - "asar-integrity": "0.2.3", + "asar-integrity": "0.2.4", "async-exit-hook": "2.0.1", "bluebird-lst": "1.0.5", - "builder-util": "3.5.0", - "builder-util-runtime": "3.5.0", + "builder-util": "4.1.1", + "builder-util-runtime": "4.0.0", "chromium-pickle-js": "0.2.0", "debug": "3.1.0", - "dmg-builder": "2.1.10", + "dmg-builder": "3.1.0", "ejs": "2.5.7", "electron-osx-sign": "0.4.7", - "electron-publish": "19.50.0", + "electron-publish": "19.52.0", "fs-extra-p": "4.5.0", "hosted-git-info": "2.5.0", - "is-ci": "1.0.10", + "is-ci": "1.1.0", "isbinaryfile": "3.0.2", "js-yaml": "3.10.0", "lazy-val": "1.0.3", "minimatch": "3.0.4", "normalize-package-data": "2.4.0", "plist": "2.1.0", - "read-config-file": "1.2.2", + "read-config-file": "2.0.1", "sanitize-filename": "1.6.1", "semver": "5.4.1", - "temp-file": "3.0.0" + "temp-file": "3.1.0" }, "dependencies": { "debug": { @@ -989,88 +956,6 @@ "sumchecker": "1.3.1" } }, - "electron-installer-debian": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/electron-installer-debian/-/electron-installer-debian-0.5.2.tgz", - "integrity": "sha1-8aEaPE9g60EeBv2Sn+bY0ST5+gY=", - "dev": true, - "requires": { - "asar": "0.13.0", - "async": "2.5.0", - "debug": "2.6.8", - "fs-extra": "1.0.0", - "get-folder-size": "1.0.0", - "glob": "7.1.2", - "lodash": "4.17.4", - "temp": "0.8.3", - "word-wrap": "1.2.3", - "yargs": "7.1.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "fs-extra": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", - "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "1.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" - } - }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - } - } - } - }, "electron-osx-sign": { "version": "0.4.7", "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.7.tgz", @@ -1225,17 +1110,17 @@ } }, "electron-publish": { - "version": "19.50.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-19.50.0.tgz", - "integrity": "sha512-ujOSZKz1rnrnyf2xYrzGpSuaj90YwuU80ZHrUxRSs+m2noqSIJ8P9Lc7G8Hyqv+Ymji3fLPMh8xCMo6YYSV+4Q==", + "version": "19.52.0", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-19.52.0.tgz", + "integrity": "sha512-Ki0lhJDjqMrEi4Bj38OVTUZfEudyMJ9pJJOIKrYZ8wAZ5BaPT2Jq6pXt2nCFcV8+n91LdCyB4K3cCPh7llsNHQ==", "dev": true, "requires": { "bluebird-lst": "1.0.5", - "builder-util": "3.5.0", - "builder-util-runtime": "3.5.0", + "builder-util": "4.1.1", + "builder-util-runtime": "4.0.0", "chalk": "2.3.0", "fs-extra-p": "4.5.0", - "mime": "2.1.0" + "mime": "2.2.0" } }, "electron-store": { @@ -1439,24 +1324,6 @@ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", "dev": true }, - "get-folder-size": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-folder-size/-/get-folder-size-1.0.0.tgz", - "integrity": "sha1-E01mOg50VhG3L3HIOxPxsS8xuik=", - "dev": true, - "requires": { - "async": "1.5.2", - "minimist": "1.2.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - } - } - }, "get-package-info": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", @@ -1737,9 +1604,9 @@ } }, "is-ci": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz", - "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { "ci-info": "1.1.2" @@ -2004,24 +1871,12 @@ } } }, - "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", - "dev": true - }, "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", - "dev": true - }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -2090,9 +1945,9 @@ } }, "mime": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.1.0.tgz", - "integrity": "sha512-jPEuocEVyg24I7hWcF6EL5qH0OQ3Ficy95tXA9eNBN6qXsIopYi/CJl3ldTUR+Sljt2rP2SkWpeTcAMon/pjKA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz", + "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA==", "dev": true }, "mime-db": { @@ -2186,15 +2041,21 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "node-emoji": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz", - "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==", + "node": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/node/-/node-9.4.0.tgz", + "integrity": "sha512-tqcU/4JVwvpbktGCA0LgAzR7mudW1UfPURpakRpu5UE29GQBIlqhyjZqM0eMRDl/CsY1ktAghM4oBI770zMRww==", "dev": true, "requires": { - "lodash.toarray": "4.4.0" + "node-bin-setup": "1.0.6" } }, + "node-bin-setup": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/node-bin-setup/-/node-bin-setup-1.0.6.tgz", + "integrity": "sha512-uPIxXNis1CRbv1DwqAxkgBk5NFV3s7cMN/Gf556jSw6jBvV7ca4F9lRL/8cALcZecRibeqU+5dFYqFFmzv5a0Q==", + "dev": true + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -5516,9 +5377,9 @@ "dev": true }, "read-config-file": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-1.2.2.tgz", - "integrity": "sha512-Q6bxc6mm2ZalO0PWgUelfo0Fp91/EKtA1yL4apvzCzK9krhftr9vOq1td9vU1nxpadMjfnudv4Ye/WXm4IWTWQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-2.0.1.tgz", + "integrity": "sha512-mVAmtNUqG5k3LWhBobuxqwotZc1LbITMHrXlx1jQti5got0ZlidjEvdSV+Jx14PxB2P7MzaxOz2dQ/jNXcNLxw==", "dev": true, "requires": { "ajv": "5.5.2", @@ -5922,28 +5783,10 @@ "has-flag": "2.0.0" } }, - "temp": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", - "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2", - "rimraf": "2.2.8" - }, - "dependencies": { - "rimraf": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=", - "dev": true - } - } - }, "temp-file": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.0.0.tgz", - "integrity": "sha512-WaSZQMckvo975nF1fSv05Nuya63AiLtyn0oYURF1xw1BF092CpIXgRv/Y0vQeocL5pv4ouVsBOnTCoK4kAK2uQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.0.tgz", + "integrity": "sha512-E5dkoqFYpIEKEqvEs53cTwJRg5Bm3r2vxIcnz+AJPtKpexA2Zf8I2gYVkbnpE7qc10Au7oa/2tT7dC3v2wK6uA==", "dev": true, "requires": { "async-exit-hook": "2.0.1", @@ -6215,12 +6058,6 @@ } } }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", @@ -6287,12 +6124,12 @@ "dev": true }, "yargs": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz", - "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.1.tgz", + "integrity": "sha512-7uRL1HZdCbc1QTP+X8mehOPuCYKC/XTaqAPj7gABLfTt6pgLyVRn3QVte4qhtilZouWCvqd1kipgMKl5tKsFiw==", "dev": true, "requires": { - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", "find-up": "2.1.0", "get-caller-file": "1.0.2", @@ -6312,6 +6149,17 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "cliui": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", + "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", diff --git a/package.json b/package.json index e473fe4..5dcb540 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,7 @@ ] }, "linux": { - "target": "zip", - "icon": "images/pinpoint_logo_ico.ico" + "target": "zip" }, "win": { "target": "zip", @@ -52,11 +51,11 @@ }, "devDependencies": { "asar": "^0.13.0", - "electron": "^1.7.9", - "electron-builder": "^19.50.0", - "electron-installer-debian": "^0.5.2", + "electron": "^1.7.10", + "electron-builder": "^19.52.1", "electron-packager": "^9.1.0", - "electron-prebuilt": "^1.4.13" + "electron-prebuilt": "^1.4.13", + "node": "^9.4.0" }, "dependencies": { "datatables.net": "^1.10.16",