Skip to content

Commit 3ebb2a9

Browse files
authored
Merge pull request #5 from zonayedpca/0.4.0-beta
0.4.0 beta release
2 parents a260bf9 + a4652a0 commit 3ebb2a9

File tree

6 files changed

+81
-43
lines changed

6 files changed

+81
-43
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ node_js:
88
cache:
99
directories:
1010
- node_modules
11-
before_install:
12-
- npm run install:client
13-
after_success:
14-
- npm run pack
11+
deploy:
12+
provider: script
13+
script: npm run pack
14+
on:
15+
branch: master

appveyor.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
image: Visual Studio 2017
22

3+
branches:
4+
only:
5+
- master
6+
37
platform:
48
- x64
9+
- x86
510

611
cache:
712
- node_modules
@@ -11,11 +16,18 @@ init:
1116
- git config --global core.autocrlf input
1217

1318
install:
14-
- ps: Install-Product node 8 x64
15-
- yarn run install:client
19+
- ps: Install-Product node 8 $env:platform
1620
- yarn install
1721

22+
build: off
23+
24+
test_script:
25+
- yarn test
26+
1827
build_script:
28+
- ''
29+
30+
deploy_script:
1931
- yarn run pack
2032

2133
test: on

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"dependencies": {
77
"@material-ui/core": "^4.0.0",
8-
"axios": "^0.18.0",
8+
"axios": "^0.18.1",
99
"react": "^16.8.6",
1010
"react-dom": "^16.8.6",
1111
"react-icons": "^3.7.0",

client/yarn.lock

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,13 +2198,13 @@ aws4@^1.8.0:
21982198
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
21992199
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
22002200

2201-
axios@^0.18.0:
2202-
version "0.18.0"
2203-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
2204-
integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
2201+
axios@^0.18.1:
2202+
version "0.18.1"
2203+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
2204+
integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
22052205
dependencies:
2206-
follow-redirects "^1.3.0"
2207-
is-buffer "^1.1.5"
2206+
follow-redirects "1.5.10"
2207+
is-buffer "^2.0.2"
22082208

22092209
axobject-query@^2.0.2:
22102210
version "2.0.2"
@@ -3528,7 +3528,7 @@ debug@=3.1.0:
35283528
dependencies:
35293529
ms "2.0.0"
35303530

3531-
debug@^3.2.5, debug@^3.2.6:
3531+
debug@^3.2.5:
35323532
version "3.2.6"
35333533
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
35343534
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -4104,14 +4104,16 @@ eslint-scope@^4.0.3:
41044104
estraverse "^4.1.1"
41054105

41064106
eslint-utils@^1.3.1:
4107-
version "1.3.1"
4108-
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
4109-
integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
4107+
version "1.4.2"
4108+
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
4109+
integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
4110+
dependencies:
4111+
eslint-visitor-keys "^1.0.0"
41104112

41114113
eslint-visitor-keys@^1.0.0:
4112-
version "1.0.0"
4113-
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
4114-
integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
4114+
version "1.1.0"
4115+
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
4116+
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
41154117

41164118
eslint@^5.16.0:
41174119
version "5.16.0"
@@ -4535,20 +4537,20 @@ flush-write-stream@^1.0.0:
45354537
inherits "^2.0.3"
45364538
readable-stream "^2.3.6"
45374539

4540+
4541+
version "1.5.10"
4542+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
4543+
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
4544+
dependencies:
4545+
debug "=3.1.0"
4546+
45384547
follow-redirects@^1.0.0:
45394548
version "1.6.1"
45404549
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.1.tgz#514973c44b5757368bad8bddfe52f81f015c94cb"
45414550
integrity sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==
45424551
dependencies:
45434552
debug "=3.1.0"
45444553

4545-
follow-redirects@^1.3.0:
4546-
version "1.7.0"
4547-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
4548-
integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
4549-
dependencies:
4550-
debug "^3.2.6"
4551-
45524554
for-in@^0.1.3:
45534555
version "0.1.8"
45544556
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -5394,7 +5396,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
53945396
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
53955397
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
53965398

5397-
is-buffer@^2.0.0:
5399+
is-buffer@^2.0.0, is-buffer@^2.0.2:
53985400
version "2.0.3"
53995401
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
54005402
integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
@@ -6483,7 +6485,7 @@ locate-path@^3.0.0:
64836485
p-locate "^3.0.0"
64846486
path-exists "^3.0.0"
64856487

6486-
lodash._reinterpolate@~3.0.0:
6488+
lodash._reinterpolate@^3.0.0:
64876489
version "3.0.0"
64886490
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
64896491
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
@@ -6504,19 +6506,19 @@ lodash.tail@^4.1.1:
65046506
integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
65056507

65066508
lodash.template@^4.2.4, lodash.template@^4.4.0:
6507-
version "4.4.0"
6508-
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
6509-
integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
6509+
version "4.5.0"
6510+
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
6511+
integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
65106512
dependencies:
6511-
lodash._reinterpolate "~3.0.0"
6513+
lodash._reinterpolate "^3.0.0"
65126514
lodash.templatesettings "^4.0.0"
65136515

65146516
lodash.templatesettings@^4.0.0:
6515-
version "4.1.0"
6516-
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
6517-
integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
6517+
version "4.2.0"
6518+
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
6519+
integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
65186520
dependencies:
6519-
lodash._reinterpolate "~3.0.0"
6521+
lodash._reinterpolate "^3.0.0"
65206522

65216523
65226524
version "4.0.1"
@@ -6821,9 +6823,9 @@ mississippi@^3.0.0:
68216823
through2 "^2.0.0"
68226824

68236825
mixin-deep@^1.2.0:
6824-
version "1.3.1"
6825-
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
6826-
integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
6826+
version "1.3.2"
6827+
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
6828+
integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
68276829
dependencies:
68286830
for-in "^1.0.2"
68296831
is-extendable "^1.0.1"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "devtop",
3-
"version": "0.3.1",
3+
"version": "0.4.0",
44
"description": "DevTop - Essential Tools for Developers",
55
"main": "app.js",
66
"author": "Zonayed Ahmed",
77
"scripts": {
8-
"install:client": "cd client && npm install",
8+
"preinstall": "cd client && npm install",
99
"test-client": "npm run test --prefix client -- --watchAll=false",
1010
"test": "npm run test-client",
1111
"client": "npm start --prefix client",

src/module/AppUpdater.js

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,31 @@
1+
const { dialog } = require('electron');
12
const { autoUpdater } = require('electron-updater');
23

4+
const { isDev } = require('../utils');
5+
36
class AppUpdater {
47
constructor() {
5-
autoUpdater.checkForUpdatesAndNotify();
8+
autoUpdater.checkForUpdates();
9+
autoUpdater.on('update-downloaded', () => {
10+
if (!isDev()) {
11+
dialog.showMessageBox({
12+
type: 'info',
13+
title: 'Found Updates',
14+
message: 'Found updates, do you want update now?',
15+
buttons: ['Sure', 'No']
16+
}, (buttonIndex) => {
17+
if (buttonIndex === 0) {
18+
const isSilent = true;
19+
const isForceRunAfter = true;
20+
autoUpdater.quitAndInstall(isSilent, isForceRunAfter);
21+
} else {
22+
// updater.enabled = true
23+
// updater = null
24+
}
25+
});
26+
}
27+
28+
});
629
}
730
}
831

0 commit comments

Comments
 (0)