Merge pull request #7 from arturock/dependencies

Update dependencies

Author: artrz

app/app.js

@@ -11,7 +11,7 @@ const settings = require('electron-settings');
 const menus = require('./menus');
 
 const ELECTRON_VERSION = process.versions.electron;
-const APP_NAME = app.getName();
+const APP_NAME = app.name;
 const APP_VERSION = app.getVersion();
 const APP_DESCRIPTION = 'Unofficial Basecamp GNU/Linux Desktop Client.';
 const BASECAMP_URL = 'https://launchpad.37signals.com';
@@ -30,24 +30,25 @@ let unreadsNotified = false;
  */
 const basecamp = {
   buildApp(url) {
-    basecamp.createWindow(url);
-    basecamp.addAppMenu();
-    basecamp.addContextMenu();
-    basecamp.addTrayIcon();
-    basecamp.setIcons();
+    this.createWindow(url);
+    this.addAppMenu();
+    this.addContextMenu();
+    this.addTrayIcon();
+    this.setIcons();
+    this.addWindowEvents();
   },
 
   /**
    * Creates the app window.
    */
   createWindow(url) {
     win = new BrowserWindow({
-      y: settings.get('posY', 0),
-      x: settings.get('posX', 0),
-      width: settings.get('width', 770),
-      height: settings.get('height', 700),
+      y: settings.getSync('posY', 0),
+      x: settings.getSync('posX', 0),
+      width: settings.getSync('width', 770),
+      height: settings.getSync('height', 700),
       title: APP_NAME,
-      icon: basecamp.getIcon('icon'),
+      icon: this.getIcon('icon'),
       autoHideMenuBar: true,
       backgroundColor: '#f5efe6',
       webPreferences: {
@@ -56,28 +57,30 @@ const basecamp = {
       },
     });
 
-    if (settings.get('isMaximized', false)) {
+    if (settings.getSync('isMaximized', false)) {
       win.maximize();
     }
 
     win.loadURL(url);
+  },
 
+  addWindowEvents() {
     win
       .on('close', () => {
         const bounds = win.getBounds();
-        settings.set('posX', bounds.x);
-        settings.set('posY', bounds.y);
-        settings.set('width', bounds.width);
-        settings.set('height', bounds.height);
-        settings.set('isMaximized', win.isMaximized());
+        settings.setSync('posX', bounds.x);
+        settings.setSync('posY', bounds.y);
+        settings.setSync('width', bounds.width);
+        settings.setSync('height', bounds.height);
+        settings.setSync('isMaximized', win.isMaximized());
       })
       .on('closed', () => {
         tray = null;
         win = null;
       })
       .on('page-title-updated', (event, title) => {
         event.preventDefault();
-        basecamp.setTitles(title);
+        this.setTitles(title);
       });
 
     win.webContents
@@ -126,7 +129,7 @@ const basecamp = {
    * Adds the tray icon.
    */
   addTrayIcon() {
-    tray = new Tray(basecamp.getIcon('tray'));
+    tray = new Tray(this.getIcon('tray'));
     tray.setToolTip(APP_NAME);
     tray.setContextMenu(menus.forTray());
     tray.on('click', () => {
@@ -150,7 +153,7 @@ const basecamp = {
       message: 'This will clear all data.\n\nDo you want to proceed?',
     }, (response) => {
       if (response === 0) {
-        basecamp.clearData();
+        this.clearData();
       }
     });
   },
@@ -161,7 +164,7 @@ const basecamp = {
   showAboutDialog() {
     dialog.showMessageBox(win, {
       type: 'info',
-      icon: basecamp.getIcon('logo'),
+      icon: this.getIcon('logo'),
       buttons: ['Ok'],
       defaultId: 0,
       title: 'About',
@@ -207,13 +210,13 @@ const basecamp = {
           unreadsNotified = true;
         }
 
-        if (settings.get('showBadge', DEFAULTS.showBadge)) {
-          basecamp.setIcons(`-unreads-${(unreads > 10 ? '10p' : unreads)}`);
+        if (settings.getSync('showBadge', DEFAULTS.showBadge)) {
+          this.setIcons(`-unreads-${(unreads > 10 ? '10p' : unreads)}`);
         } else {
-          basecamp.setIcons('-unreads');
+          this.setIcons('-unreads');
         }
       } else {
-        basecamp.setIcons();
+        this.setIcons();
       }
     });
   },
@@ -222,8 +225,8 @@ const basecamp = {
    * Sets the app & tray icons.
    */
   setIcons(suffix) {
-    win.setIcon(basecamp.getIcon(`icon${suffix ? '-unreads' : ''}`));
-    tray.setImage(basecamp.getIcon(`tray${suffix || ''}`));
+    win.setIcon(this.getIcon(`icon${suffix ? '-unreads' : ''}`));
+    tray.setImage(this.getIcon(`tray${suffix || ''}`));
   },
 
   /**
@@ -234,7 +237,7 @@ const basecamp = {
    * @return {string}
    */
   getIcon(icon) {
-    const iconScheme = settings.get('iconScheme', DEFAULTS.iconScheme);
+    const iconScheme = settings.getSync('iconScheme') || DEFAULTS.iconScheme;
     return `${ICONS_PATH}/${iconScheme}/${icon}.png`;
   },
 
@@ -256,7 +259,7 @@ const basecamp = {
    * @param {string} color
    */
   configureIconScheme(color) {
-    settings.set('iconScheme', color);
+    settings.setSync('iconScheme', color);
     win.reload();
   },
 
@@ -266,7 +269,7 @@ const basecamp = {
    * @param {string} color
    */
   configureShowBadge(config) {
-    settings.set('showBadge', config);
+    settings.setSync('showBadge', config);
     win.reload();
   },
 };

app/package.json

@@ -3,7 +3,7 @@
   "productName": "Basecamp for Linux",
   "baseName": "basecamp",
   "description": "Unofficial Basecamp GNU/Linux Desktop Client.",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "Arturo Rodríguez",
   "license": "MIT",
   "main": "app.js",
@@ -21,6 +21,6 @@
     "Desktop"
   ],
   "dependencies": {
-    "electron-settings": "^3.2.0"
+    "electron-settings": "^4.0.2"
   }
 }

package.json

@@ -2,18 +2,18 @@
   "license": "MIT",
   "private": true,
   "config": {
-    "current_version": "0.1.2"
+    "current_version": "0.1.3"
   },
   "devDependencies": {
     "basecamp-linux": "file:app",
-    "electron": "^1.8.7",
-    "electron-packager": "11.2.0",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb-base": "^13.0.0",
-    "eslint-plugin-import": "^2.13.0",
-    "lzma-native": "^3.0.8",
-    "minimist": "^1.2.0",
-    "tar": "^4.4.4"
+    "electron": "8.4.1",
+    "electron-packager": "11.2.1",
+    "eslint": "^7.5.0",
+    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint-plugin-import": "^2.22.0",
+    "lzma-native": "^6.0.1",
+    "minimist": "^1.2.5",
+    "tar": "^6.0.2"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

scripts/build.js

@@ -66,7 +66,7 @@ const builder = {
 
     const arch = { arch: ARGS.arch.split(',') };
 
-    packager(Object.assign({}, PACKAGE_CONFIG, arch))
+    packager({ ...PACKAGE_CONFIG, ...arch })
       .then((appPaths) => {
         appPaths.forEach((appPath) => {
           if (ARGS.compress) {