no tray, use badge

Author: Leksat

clock.icns

@@ -9,7 +9,7 @@
     "package": "electron-forge package",
     "make": "electron-forge make",
     "publish": "electron-forge publish",
-    "lint": "eslint --ext .ts,.tsx ."
+    "lint": "tsc --noEmit && eslint --ext .ts,.tsx ."
   },
   "keywords": [],
   "author": {
@@ -46,7 +46,9 @@
           }
         }
       ],
-      "packagerConfig": {},
+      "packagerConfig": {
+        "icon": "clock.icns"
+      },
       "makers": [
         {
           "name": "@electron-forge/maker-squirrel",
@@ -102,7 +104,6 @@
     "@typescript-eslint/eslint-plugin": "^4.0.1",
     "@typescript-eslint/parser": "^4.0.1",
     "@vercel/webpack-asset-relocator-loader": "1.7.0",
-    "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^6.0.0",
     "electron": "15.1.0",
     "eslint": "^7.6.0",

package.json

@@ -0,0 +1,34 @@
+import { parseEntries } from '../shared/entries';
+import { parseTicket } from '../shared/tickets';
+import { AppError } from '../shared/errors';
+import { App } from '../shared/types';
+
+const getText = (entries: string): string => {
+  try {
+    const parsed = parseEntries(entries);
+    const lastEntry = parsed[parsed.length - 1];
+    if (lastEntry) {
+      const ticket = parseTicket(lastEntry.description);
+      if (ticket !== '') {
+        return ticket;
+      }
+    }
+  } catch (e) {
+    if (e instanceof AppError) {
+      // No need to warn user here.
+    } else {
+      throw e;
+    }
+  }
+  return '';
+};
+
+export const initBadge = (app: App): void => {
+  const onEntriesUpdate = (entries: string | undefined) => {
+    const text = getText(entries || '');
+    app.electronApp.dock.setBadge(text);
+  };
+
+  app.store.onDidChange('entries', onEntriesUpdate);
+  onEntriesUpdate(app.store.get('entries'));
+};

src/main/assets/tray-idle.png

@@ -1,9 +1,11 @@
 import { app as electronApp, BrowserWindow, dialog } from 'electron';
-import { createTray } from './tray';
 import { registerShortcuts } from './shortcuts';
 import { connectStore } from './store';
 import { app } from './app';
 import { AppError } from '../shared/errors';
+import { parseEntries } from '../shared/entries';
+import { parseTicket } from '../shared/tickets';
+import { initBadge } from './badge';
 declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
 
 // From the boilerplate: Handle creating/removing shortcuts on Windows when
@@ -28,7 +30,6 @@ electronApp.on('ready', () => {
       nodeIntegration: true,
       contextIsolation: false,
     },
-    skipTaskbar: true,
   });
 
   app.window
@@ -42,10 +43,6 @@ electronApp.on('ready', () => {
     }
   });
 
-  app.window.on('blur', () => {
-    app.electronApp.hide();
-  });
-
   connectStore(app);
 });
 
@@ -55,12 +52,9 @@ electronApp.on('before-quit', () => {
 
 electronApp.whenReady().then(() => {
   registerShortcuts(app);
-  createTray(app);
+  initBadge(app);
 });
 
 electronApp.on('window-all-closed', () => {
   // Empty handler is required to disable auto-exit.
 });
-
-// Electron.BrowserWindowConstructorOptions.skipTaskbar does not work on Mac.
-electronApp.dock.hide();

src/main/assets/tray-idle@2x.png

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const CopyPlugin = require('copy-webpack-plugin');
-
 module.exports = {
   target: 'electron-main',
   /**
@@ -15,9 +12,4 @@ module.exports = {
   resolve: {
     extensions: ['.js', '.ts', '.jsx', '.tsx', '.css', '.json'],
   },
-  plugins: [
-    new CopyPlugin({
-      patterns: [{ from: 'src/main/assets', to: 'assets' }],
-    }),
-  ],
 };

src/main/assets/tray-working.png

@@ -1747,19 +1747,6 @@ cookie@0.4.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
-copy-webpack-plugin@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59"
-  integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw==
-  dependencies:
-    fast-glob "^3.2.5"
-    glob-parent "^6.0.0"
-    globby "^11.0.3"
-    normalize-path "^3.0.0"
-    p-limit "^3.1.0"
-    schema-utils "^3.0.0"
-    serialize-javascript "^6.0.0"
-
 core-js@^3.6.5:
   version "3.18.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.1.tgz#289d4be2ce0085d40fc1244c0b1a54c00454622f"
@@ -2728,7 +2715,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7:
+fast-glob@^3.1.1, fast-glob@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
   integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
@@ -3116,13 +3103,6 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -3724,7 +3704,7 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -5720,7 +5700,7 @@ schema-utils@2.7.0:
     ajv "^6.12.2"
     ajv-keywords "^3.4.1"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==