Skip to content

Commit 6123ab7

Browse files
zonayedpcazonayedpca
authored
Merge pull request #10 from zonayedpca/v0.9.0-beta
V0.9.0 beta Release
2 parents f349905 + 08d2437 commit 6123ab7

File tree

12 files changed

+97
-113
lines changed

12 files changed

+97
-113
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
language: node_js
22
matrix:
33
include:
4-
- os: linux
54
- os: osx
65
node_js:
76
- 8
87
cache:
98
directories:
109
- node_modules
11-
env:
12-
- ELECTRON_FORCE_WINDOW_MENU_BAR=true
1310
after_success:
1411
- if [ $TRAVIS_BRANCH == "master" ]; then npm run pack; fi

‎app.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ const WINDOW_URL = isDev()
1414
? 'http://localhost:3000'
1515
: `file://${__dirname}/client/build/index.html`;
1616
const iconName =
17-
process.platform === 'darwin' ? 'iconTemplate.png' : 'windows-icon.png';
17+
process.platform === 'win32' ? 'windows-icon.png' : 'mac-icon.png';
1818
const iconPath = path.join(__dirname, `src/assets/img/${iconName}`);
1919

2020
let mainWindow;
2121
// eslint-disable-next-line no-unused-vars
2222
let tray;
2323

24+
if (process.platform === 'darwin') {
25+
app.dock.hide();
26+
}
27+
2428
app.on('ready', () => {
25-
if (process.platform === 'darwin') {
26-
app.dock.hide();
27-
}
2829
setScreenSize();
2930
mainWindow = new MainWindow(
3031
{

‎client/src/components/Settings.js‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import './settings.css';
1515

1616
const Settings = ({ verifyGithubToken, verifyBitlyToken, resetTokens }) => {
1717
return (
18-
<div className="settings">
18+
<div className="settings-area">
1919
<AppBar
2020
position="static"
2121
color="default"
@@ -34,29 +34,35 @@ const Settings = ({ verifyGithubToken, verifyBitlyToken, resetTokens }) => {
3434
<Typography variant="h6">Settings</Typography>
3535
</Toolbar>
3636
</AppBar>
37-
<div className="content">
38-
<TokenInput
39-
onSubmit={verifyGithubToken}
40-
name="GitHub"
41-
instruction="Generate a personal access token from GitHub. This access token should have the scope to 'Create Gists'"
42-
/>
43-
<TokenInput
44-
onSubmit={verifyBitlyToken}
45-
name="Bitly"
46-
instruction="Genrate a Generic Access token from Bitly"
47-
/>
48-
<div className="aciton">
49-
<button onClick={() => resetTokens()} className="btn-reset">
50-
Reset
51-
</button>
52-
</div>
53-
<div className="privacy">
54-
<p>
55-
<strong>
56-
We don't store any of these keys. Everything is done
57-
locally. Thus your information is kept safe.
58-
</strong>
59-
</p>
37+
<div className="settings">
38+
<div className="content">
39+
<TokenInput
40+
onSubmit={verifyGithubToken}
41+
name="GitHub"
42+
instruction="Generate a personal access token from GitHub. This access token should have the scope to 'Create Gists'"
43+
/>
44+
<TokenInput
45+
onSubmit={verifyBitlyToken}
46+
name="Bitly"
47+
instruction="Genrate a Generic Access token from Bitly"
48+
/>
49+
<div className="aciton">
50+
<button
51+
onClick={() => resetTokens()}
52+
className="btn-reset"
53+
>
54+
Reset
55+
</button>
56+
</div>
57+
<div className="privacy">
58+
<p>
59+
<strong>
60+
We don't store any of these keys. Everything is
61+
done locally. Thus your information is kept
62+
safe.
63+
</strong>
64+
</p>
65+
</div>
6066
</div>
6167
</div>
6268
</div>

‎client/src/components/settings.css‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
.settings .MuiToolbar-regular {
1+
.settings-area .MuiToolbar-regular {
22
min-height: 48px;
33
}
44

5-
.settings .MuiIconButton-root:hover {
5+
.settings-area .MuiIconButton-root:hover {
66
border-radius: 100%;
77
}
88

9+
.settings {
10+
display: flex;
11+
width: 100%;
12+
height: 100vh;
13+
}
14+
915
.settings .content {
16+
flex: 1;
1017
margin-top: 45px;
1118
padding: 15px;
12-
height: 380px;
13-
overflow-y: scroll;
19+
overflow: auto;
1420
}
1521

1622
.settings .content .btn-reset {

‎electron-builder.yml‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mac:
1616

1717
# Windows configuration
1818
win:
19-
icon: 'src/assets/img/windows-icon.png'
19+
icon: 'src/assets/img/icon256x256.png'
2020
target:
2121
- target: 'nsis'
2222
arch:
@@ -35,29 +35,3 @@ win:
3535
# Config for the windows installer
3636
nsis:
3737
oneClick: false
38-
39-
# Linux configuration
40-
linux:
41-
icon: 'src/assets/img/iconTemplate.png'
42-
target:
43-
- target: 'AppImage'
44-
arch:
45-
- x64
46-
- ia32
47-
- target: 'deb'
48-
arch:
49-
- x64
50-
- ia32
51-
- target: 'rpm'
52-
arch:
53-
- x64
54-
- ia32
55-
- target: 'zip'
56-
arch:
57-
- x64
58-
- ia32
59-
- target: 'tar.gz'
60-
arch:
61-
- x64
62-
- ia32
63-
publish: ['github']

‎package.json‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
{
2-
"name": "devtop",
3-
"version": "0.8.0-beta",
4-
"description": "DevTop - Essential Tools for Developers",
5-
"main": "app.js",
6-
"author": {
7-
"name": "Zonayed Ahmed",
8-
"email": "[email protected]"
9-
},
10-
"scripts": {
11-
"preinstall": "cd client && yarn install",
12-
"test-client": "npm run test --prefix client -- --watchAll=false",
13-
"test": "npm run test-client",
14-
"client": "npm start --prefix client",
15-
"build": "npm run build --prefix client",
16-
"electron": "nodemon --watch * --exec \"electron .\"",
17-
"start": "concurrently --kill-others \"npm run client\" \"wait-on tcp:3000 && npm run electron\"",
18-
"version:major": "npm version major",
19-
"version:minor": "npm version minor",
20-
"version:patch": "npm version patch",
21-
"pack": "npm run build && electron-builder -p always"
22-
},
23-
"repository": {
24-
"type": "git",
25-
"url": "git+https://github.com/zonayedpca/DevTop.git"
26-
},
27-
"keywords": [
28-
"desktop",
29-
"dev-tools",
30-
"developer-tools",
31-
"essential-dev",
32-
"essential-developer"
33-
],
34-
"license": "ISC",
35-
"bugs": {
36-
"url": "https://github.com/zonayedpca/DevTop/issues"
37-
},
38-
"homepage": "https://github.com/zonayedpca/DevTop#readme",
39-
"devDependencies": {
40-
"concurrently": "^4.1.0",
41-
"electron": "^5.0.2",
42-
"electron-builder": "^21.2.0",
43-
"eslint": "^6.3.0",
44-
"nodemon": "^1.19.1",
45-
"prettier": "1.18.2",
46-
"wait-on": "^3.3.0"
47-
},
48-
"dependencies": {
49-
"auto-launch": "^5.0.5",
50-
"electron-updater": "^4.1.2"
51-
}
2+
"name": "devtop",
3+
"version": "0.9.0-beta",
4+
"description": "DevTop - Essential Tools for Developers",
5+
"main": "app.js",
6+
"author": {
7+
"name": "Zonayed Ahmed",
8+
"email": "[email protected]"
9+
},
10+
"scripts": {
11+
"preinstall": "cd client && yarn install",
12+
"test-client": "npm run test --prefix client -- --watchAll=false",
13+
"test": "npm run test-client",
14+
"client": "npm start --prefix client",
15+
"build": "npm run build --prefix client",
16+
"electron": "nodemon --watch * --exec \"electron .\"",
17+
"start": "concurrently --kill-others \"npm run client\" \"wait-on tcp:3000 && npm run electron\"",
18+
"version:major": "npm version major",
19+
"version:minor": "npm version minor",
20+
"version:patch": "npm version patch",
21+
"pack": "npm run build && electron-builder -p always"
22+
},
23+
"repository": {
24+
"type": "git",
25+
"url": "git+https://github.com/zonayedpca/DevTop.git"
26+
},
27+
"keywords": [
28+
"desktop",
29+
"dev-tools",
30+
"developer-tools",
31+
"essential-dev",
32+
"essential-developer"
33+
],
34+
"license": "ISC",
35+
"bugs": {
36+
"url": "https://github.com/zonayedpca/DevTop/issues"
37+
},
38+
"homepage": "https://github.com/zonayedpca/DevTop#readme",
39+
"devDependencies": {
40+
"concurrently": "^4.1.0",
41+
"electron": "^5.0.2",
42+
"electron-builder": "^21.2.0",
43+
"eslint": "^6.3.0",
44+
"nodemon": "^1.19.1",
45+
"prettier": "1.18.2",
46+
"wait-on": "^3.3.0"
47+
},
48+
"dependencies": {
49+
"auto-launch": "^5.0.5",
50+
"electron-updater": "^4.1.2"
51+
}
5252
}

‎src/assets/img/icon256x256.png‎

7.02 KB
Loading

‎src/assets/img/iconTemplate.png‎

-10.9 KB
Binary file not shown.

‎src/assets/img/mac-icon.png‎

1.39 KB
Loading

‎src/assets/img/[email protected]‎

1.33 KB
Loading

0 commit comments

Comments
 (0)