diff --git a/.travis.yml b/.travis.yml index 8902dee..b738ff2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,11 @@ language: node_js matrix: include: - - os: linux - os: osx node_js: - 8 cache: directories: - node_modules -env: - - ELECTRON_FORCE_WINDOW_MENU_BAR=true after_success: - if [ $TRAVIS_BRANCH == "master" ]; then npm run pack; fi diff --git a/app.js b/app.js index d8cd2ad..8396905 100644 --- a/app.js +++ b/app.js @@ -14,17 +14,18 @@ const WINDOW_URL = isDev() ? 'http://localhost:3000' : `file://${__dirname}/client/build/index.html`; const iconName = - process.platform === 'darwin' ? 'iconTemplate.png' : 'windows-icon.png'; + process.platform === 'win32' ? 'windows-icon.png' : 'mac-icon.png'; const iconPath = path.join(__dirname, `src/assets/img/${iconName}`); let mainWindow; // eslint-disable-next-line no-unused-vars let tray; +if (process.platform === 'darwin') { + app.dock.hide(); +} + app.on('ready', () => { - if (process.platform === 'darwin') { - app.dock.hide(); - } setScreenSize(); mainWindow = new MainWindow( { diff --git a/client/src/components/Settings.js b/client/src/components/Settings.js index ade082e..ff511a0 100644 --- a/client/src/components/Settings.js +++ b/client/src/components/Settings.js @@ -15,7 +15,7 @@ import './settings.css'; const Settings = ({ verifyGithubToken, verifyBitlyToken, resetTokens }) => { return ( -
+
{ Settings -
- - -
- -
-
-

- - We don't store any of these keys. Everything is done - locally. Thus your information is kept safe. - -

+
+
+ + +
+ +
+
+

+ + We don't store any of these keys. Everything is + done locally. Thus your information is kept + safe. + +

+
diff --git a/client/src/components/settings.css b/client/src/components/settings.css index 7cfeac1..4230946 100644 --- a/client/src/components/settings.css +++ b/client/src/components/settings.css @@ -1,16 +1,22 @@ -.settings .MuiToolbar-regular { +.settings-area .MuiToolbar-regular { min-height: 48px; } -.settings .MuiIconButton-root:hover { +.settings-area .MuiIconButton-root:hover { border-radius: 100%; } +.settings { + display: flex; + width: 100%; + height: 100vh; +} + .settings .content { + flex: 1; margin-top: 45px; padding: 15px; - height: 380px; - overflow-y: scroll; + overflow: auto; } .settings .content .btn-reset { diff --git a/electron-builder.yml b/electron-builder.yml index 807a9c6..4f4df15 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -16,7 +16,7 @@ mac: # Windows configuration win: - icon: 'src/assets/img/windows-icon.png' + icon: 'src/assets/img/icon256x256.png' target: - target: 'nsis' arch: @@ -35,29 +35,3 @@ win: # Config for the windows installer nsis: oneClick: false - -# Linux configuration -linux: - icon: 'src/assets/img/iconTemplate.png' - target: - - target: 'AppImage' - arch: - - x64 - - ia32 - - target: 'deb' - arch: - - x64 - - ia32 - - target: 'rpm' - arch: - - x64 - - ia32 - - target: 'zip' - arch: - - x64 - - ia32 - - target: 'tar.gz' - arch: - - x64 - - ia32 - publish: ['github'] diff --git a/package.json b/package.json index 643dc4e..bdce78f 100644 --- a/package.json +++ b/package.json @@ -1,52 +1,52 @@ { - "name": "devtop", - "version": "0.8.0-beta", - "description": "DevTop - Essential Tools for Developers", - "main": "app.js", - "author": { - "name": "Zonayed Ahmed", - "email": "contact@zonayed.me" - }, - "scripts": { - "preinstall": "cd client && yarn install", - "test-client": "npm run test --prefix client -- --watchAll=false", - "test": "npm run test-client", - "client": "npm start --prefix client", - "build": "npm run build --prefix client", - "electron": "nodemon --watch * --exec \"electron .\"", - "start": "concurrently --kill-others \"npm run client\" \"wait-on tcp:3000 && npm run electron\"", - "version:major": "npm version major", - "version:minor": "npm version minor", - "version:patch": "npm version patch", - "pack": "npm run build && electron-builder -p always" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/zonayedpca/DevTop.git" - }, - "keywords": [ - "desktop", - "dev-tools", - "developer-tools", - "essential-dev", - "essential-developer" - ], - "license": "ISC", - "bugs": { - "url": "https://github.com/zonayedpca/DevTop/issues" - }, - "homepage": "https://github.com/zonayedpca/DevTop#readme", - "devDependencies": { - "concurrently": "^4.1.0", - "electron": "^5.0.2", - "electron-builder": "^21.2.0", - "eslint": "^6.3.0", - "nodemon": "^1.19.1", - "prettier": "1.18.2", - "wait-on": "^3.3.0" - }, - "dependencies": { - "auto-launch": "^5.0.5", - "electron-updater": "^4.1.2" - } + "name": "devtop", + "version": "0.9.0-beta", + "description": "DevTop - Essential Tools for Developers", + "main": "app.js", + "author": { + "name": "Zonayed Ahmed", + "email": "contact@zonayed.me" + }, + "scripts": { + "preinstall": "cd client && yarn install", + "test-client": "npm run test --prefix client -- --watchAll=false", + "test": "npm run test-client", + "client": "npm start --prefix client", + "build": "npm run build --prefix client", + "electron": "nodemon --watch * --exec \"electron .\"", + "start": "concurrently --kill-others \"npm run client\" \"wait-on tcp:3000 && npm run electron\"", + "version:major": "npm version major", + "version:minor": "npm version minor", + "version:patch": "npm version patch", + "pack": "npm run build && electron-builder -p always" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/zonayedpca/DevTop.git" + }, + "keywords": [ + "desktop", + "dev-tools", + "developer-tools", + "essential-dev", + "essential-developer" + ], + "license": "ISC", + "bugs": { + "url": "https://github.com/zonayedpca/DevTop/issues" + }, + "homepage": "https://github.com/zonayedpca/DevTop#readme", + "devDependencies": { + "concurrently": "^4.1.0", + "electron": "^5.0.2", + "electron-builder": "^21.2.0", + "eslint": "^6.3.0", + "nodemon": "^1.19.1", + "prettier": "1.18.2", + "wait-on": "^3.3.0" + }, + "dependencies": { + "auto-launch": "^5.0.5", + "electron-updater": "^4.1.2" + } } diff --git a/src/assets/img/icon256x256.png b/src/assets/img/icon256x256.png new file mode 100644 index 0000000..df9d2a2 Binary files /dev/null and b/src/assets/img/icon256x256.png differ diff --git a/src/assets/img/iconTemplate.png b/src/assets/img/iconTemplate.png deleted file mode 100644 index 711c809..0000000 Binary files a/src/assets/img/iconTemplate.png and /dev/null differ diff --git a/src/assets/img/mac-icon.png b/src/assets/img/mac-icon.png new file mode 100644 index 0000000..1b1ea61 Binary files /dev/null and b/src/assets/img/mac-icon.png differ diff --git a/src/assets/img/mac-icon@2x.png b/src/assets/img/mac-icon@2x.png new file mode 100644 index 0000000..3810dad Binary files /dev/null and b/src/assets/img/mac-icon@2x.png differ diff --git a/src/assets/img/windows-icon.png b/src/assets/img/windows-icon.png index faaadd5..be6883d 100644 Binary files a/src/assets/img/windows-icon.png and b/src/assets/img/windows-icon.png differ diff --git a/src/module/ApplicationTray.js b/src/module/ApplicationTray.js index 67b839b..bc23a32 100644 --- a/src/module/ApplicationTray.js +++ b/src/module/ApplicationTray.js @@ -9,7 +9,7 @@ class ApplicationTray extends Tray { this.mainWindow = mainWindow; this.on('click', this.onClick.bind(this)); this.on('right-click', this.onRightClick.bind(this)); - this.setToolTip('DevTop'); + this.setToolTip('DevTop Essentials'); this.autoStart = false; this.setAutoStart(); }