From e618c4449beac19253eb43d5937c371132c11fb9 Mon Sep 17 00:00:00 2001
From: Yash Vyas <yash.vyas.29@gmail.com>
Date: Sat, 11 May 2019 17:17:12 +0530
Subject: [PATCH 1/2] Added tray, app menu and tray menu for mac and refactored
 redundant code to separate functions.

---
 package.json                    |   5 +-
 src/main.js                     |  14 +++-
 src/state/timer-state.js        |   8 ++-
 src/windows/img/trayIcon.png    | Bin 0 -> 1281 bytes
 src/windows/img/trayIcon@2x.png | Bin 0 -> 2660 bytes
 src/windows/img/trayIcon@3x.png | Bin 0 -> 4742 bytes
 src/windows/menu-template.js    | 119 ++++++++++++++++++++++++++++++++
 src/windows/timer/index.js      |  88 ++++++++++++++++++-----
 src/windows/windows.js          |  72 ++++++++++++++++---
 9 files changed, 272 insertions(+), 34 deletions(-)
 mode change 100644 => 100755 src/main.js
 create mode 100644 src/windows/img/trayIcon.png
 create mode 100644 src/windows/img/trayIcon@2x.png
 create mode 100644 src/windows/img/trayIcon@3x.png
 create mode 100644 src/windows/menu-template.js
 mode change 100644 => 100755 src/windows/timer/index.js
 mode change 100644 => 100755 src/windows/windows.js

diff --git a/package.json b/package.json
index 3a53e76b..9b8f4883 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "mob-timer",
   "version": "1.0.0",
-  "description": "",
+  "productName": "Mob Timer",
+  "description": "A timer for mob programming.",
   "main": "src/main.js",
   "scripts": {
     "start": "electron .",
@@ -18,7 +19,7 @@
     "type": "git",
     "url": "git+https://github.com/pluralsight/mob-timer.git"
   },
-  "author": "",
+  "author": "Pluralsight",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/pluralsight/mob-timer/issues"
diff --git a/src/main.js b/src/main.js
old mode 100644
new mode 100755
index 773e5be2..051658d2
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,7 @@ app.on('ready', () => {
   if (timerState.getState().shuffleMobbersOnStartup) {
     timerState.shuffleMobbers()
   }
+  windows.createTrayIconAndMenu()
 })
 
 function onTimerEvent(event, data) {
@@ -26,15 +27,22 @@ function onTimerEvent(event, data) {
 
 ipc.on('timerWindowReady', () => timerState.initialize())
 ipc.on('configWindowReady', () => timerState.publishConfig())
-ipc.on('fullscreenWindowReady', () => timerState.publishConfig())
+ipc.on('fullscreenWindowReady', () => {
+  timerState.stopAlerts()
+  timerState.publishConfig()
+})
 
+ipc.on('reset', () => timerState.reset(true))
 ipc.on('pause', () => timerState.pause())
 ipc.on('unpause', () => timerState.start())
 ipc.on('skip', () => timerState.rotate())
-ipc.on('startTurn', () => timerState.start())
+ipc.on('startTurn', () => {
+  windows.closeFullscreenWindow()
+  timerState.start()
+})
 ipc.on('configure', () => {
-  windows.showConfigWindow()
   windows.closeFullscreenWindow()
+  windows.showConfigWindow()
 })
 
 ipc.on('shuffleMobbers', () => timerState.shuffleMobbers())
diff --git a/src/state/timer-state.js b/src/state/timer-state.js
index 948e4454..f72adf06 100644
--- a/src/state/timer-state.js
+++ b/src/state/timer-state.js
@@ -52,8 +52,13 @@ class TimerState {
     })
   }
 
-  reset() {
+  reset(stop = false) {
+    if (stop) {
+      this.mainTimer.pause()
+      this.callback('turnEnded')
+    }
     this.mainTimer.reset(this.secondsPerTurn)
+    this.stopAlerts()
     this.dispatchTimerChange(this.secondsPerTurn)
   }
 
@@ -65,6 +70,7 @@ class TimerState {
 
   stopAlerts() {
     this.alertsTimer.pause()
+    this.alertsTimer.reset(0)
     this.callback('stopAlerts')
   }
 
diff --git a/src/windows/img/trayIcon.png b/src/windows/img/trayIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..336983195b3212e00f8fe129feb766489b161008
GIT binary patch
literal 1281
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;AAzh%9Dc;1&j9Muu5)
zBp4VNBQrxHN+NuHtdjF{^%7I^lT!66atnZ}85nFTtboki)RIJnirk#MVyg;UC9n!B
zAR8pCucQE0Qj%?}6yY17;GAESs$i;TqGzCF$EBd4U{jQmW)<Y(2GtJa*(zm}loVL$
z>z9|8>y;bp<rk&v8(Lag>Khp88yV>WRp=I1=9MH?=;jqGLkxkL<C0pOT$EW*l9`{U
z05Uf*DZjMDR!IqD5gb6=S(2HCuqm$?>MfuL^+7WFhI$72aI=A0Z9t+{{zaLoK$}74
z+Zoz`RicPN?Xl4ZS&rlwh)=<yK(E?y+33TA&5q0Gka{Eo1GA8)i(`m|U~b6SY~etG
z`FDNK%&JojP+Tg%GsLz+aACla#kN-(L>F>hYvzb^arq;>r&9Eby+#YiBK2-1+mIy-
z*!On4NW6VC;P*sdv&>0n)pkG5zn6EZiSNw5?Vr=?K39LfXOoo1yULljDPmgcwbx%&
zw})wm#a=J__om?OL(?+x^Ecb4uZ-C5<UMU`UYGuKFE^Rh7Yiq(ZMF<w8)lvmEcEF1
z*V=dQrp&CbP5<{{*3Xm7c_JB$E8m})!xSACmcX=R#+&!=#jWP{DRU%BR7uqIFiv3=
z5OVl?;eExQZ>qny8}$|cE?Icq$4y9$Ny*VsU`wck-KX^`JQi=h&Tu{2zEd`D9kb4B
zllSw(&xH8?y8W`5hoRw8-u9cvzqvT*Gx0F7s-2PQ-lAxF`M|R*tGRW|`}>w<YBo$*
z_xj4~uP3(UPO4vX@x%v%r)p{(GM>%8mw6w}yMJ+>o!?eF`}j+{@4oBG;a8}#Ipq)?
z9i1{u&DY=mG7H12UbeUI-c4HfuwlUw#>|t#R<SV)E-V%0oHxBkVC6oBAZACUoiTku
zD@Ayl&pvsgay82|_4)ycm8p3F|9CF0<o;~6;`{=$q>!GJOYCp*y>*o={3IMZ1P%9o
z;b47sa;D>kh}K?<{=U9dQg7eBov8BB#{a7J<dYq@83O(uk-rkUo!2>b>4yCZ37a=>
z<~p!R=hnS@VGlNiCTemfa|*ZXNyc6FJFua%RkEk(VZiAVo(Dev+>@mC*<z+uprz$p
z)%9`{zB(^Ib^WZ1(af0Er));8MQ<hve(#D}EB4T3@qrnwB5~VvkE$y>zS-*h_OkV*
z<C&q%rNucpZ)(kE?|rgsUHHn75a+JVGWAN03<d|5s>JwN9qHub<-Pdh%9QC*+B198
z&F#bD*626*Tv0mlPDVziU}ucn77m7gg7-iFc>ca<_qK0chj*vTem|FSMd?Gx)H0dn
z3JF4;Z!0e>UN-ewhg3wBtJJLM`}-{3Eq)z%xrp=npBvFCXSok7PG@0Y2<KAh3|HFA
zdE|v;=Y18%U;ht3+vUn~gCQ+&=HfQj$}daS1x<R)e>+}c(Y{{?XDGUZ3K~yWKbLh*
G2~7ZfoC#F`

literal 0
HcmV?d00001

diff --git a/src/windows/img/trayIcon@2x.png b/src/windows/img/trayIcon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..de53f9d03f85b004940652aebafa4800e65cb720
GIT binary patch
literal 2660
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
B#RUKW

literal 0
HcmV?d00001

diff --git a/src/windows/img/trayIcon@3x.png b/src/windows/img/trayIcon@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bc51da684a35545ae9199eef194182841141fbf
GIT binary patch
literal 4742
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
Itz;ARA4D##_5c6?

literal 0
HcmV?d00001

diff --git a/src/windows/menu-template.js b/src/windows/menu-template.js
new file mode 100644
index 00000000..af5f330c
--- /dev/null
+++ b/src/windows/menu-template.js
@@ -0,0 +1,119 @@
+const electron = require('electron')
+let windows = require('./windows')
+const isMac = process.platform === 'darwin'
+
+exports.appMenuTemplate = [
+  ...(isMac ? [{
+    role: 'appMenu',
+    submenu: [
+      { role: 'about' },
+      { type: 'separator' },
+      {
+        label: 'Preferences',
+        accelerator: 'CommandOrControl+,',
+        click() { windows.showConfigWindow() }
+      },
+      { type: 'separator' },
+      { role: 'hide' },
+      { role: 'hideothers' },
+      { role: 'unhide' },
+      { type: 'separator' },
+      { role: 'quit' }
+    ]
+  }] : []),
+  {
+    label: 'Timer',
+    submenu: [
+      {
+        label: 'Start',
+        click() { windows.timerWindow.webContents.send('start') }
+      },
+      {
+        label: 'Pause',
+        visible: false,
+        click() { windows.timerWindow.webContents.send('pause') }
+      },
+      {
+        label: 'Reset',
+        visible: false,
+        click() { windows.timerWindow.webContents.send('reset') }
+      },
+      {
+        label: 'Skip',
+        click() { windows.timerWindow.webContents.send('skip') }
+      }
+    ]
+  },
+  ...(!isMac ? [
+    {
+      label: 'Tools',
+      submenu: [
+        {
+          label: 'Preferences',
+          accelerator: 'CommandOrControl+,',
+          click() { windows.showConfigWindow() }
+        }
+      ]
+    }
+  ] : []),
+  {
+    role: 'help',
+    submenu: [
+      ...(!isMac ? [
+        { role: 'about' },
+        { type: 'separator' }
+      ] : []),
+      {
+        label: 'Learn More',
+        click() { electron.shell.openExternal('https://github.com/pluralsight/mob-timer') }
+      }
+    ]
+  }
+]
+
+exports.trayMenuTemplate = [
+  { role: 'about' },
+  {
+    label: 'Timer',
+    submenu: [
+      {
+        label: 'Start',
+        click() { windows.timerWindow.webContents.send('start') }
+      },
+      {
+        label: 'Pause',
+        visible: false,
+        click() { windows.timerWindow.webContents.send('pause') }
+      },
+      {
+        label: 'Reset',
+        visible: false,
+        click() { windows.timerWindow.webContents.send('reset') }
+      },
+      {
+        label: 'Skip',
+        click() { windows.timerWindow.webContents.send('skip') }
+      }
+    ]
+  },
+  {
+    label: 'Tools',
+    submenu: [
+      {
+        label: 'Preferences',
+        accelerator: 'CommandOrControl+,',
+        click() { exports.showConfigWindow() }
+      }
+    ]
+  },
+  {
+    role: 'help',
+    submenu: [
+      {
+        label: 'Learn More',
+        click() { electron.shell.openExternal('https://github.com/pluralsight/mob-timer') }
+      }
+    ]
+  },
+  { role: 'quit' }
+]
diff --git a/src/windows/timer/index.js b/src/windows/timer/index.js
old mode 100644
new mode 100755
index 8096c3dc..3c7cf595
--- a/src/windows/timer/index.js
+++ b/src/windows/timer/index.js
@@ -55,7 +55,13 @@ function drawTimerArc(seconds, maxSeconds) {
   drawArc(begin, end, theme.mobberBorderHighlightColor)
 }
 
-ipc.on('rotated', (event, data) => {
+function drawInitialState() {
+  drawOverlays(true)
+  containerEl.classList.remove('isPaused')
+  containerEl.classList.add('isTurnEnded')
+}
+
+function drawMobbers(data) {
   if (!data.current) {
     data.current = { name: 'Add a mobber' }
   }
@@ -67,29 +73,61 @@ ipc.on('rotated', (event, data) => {
   }
   nextPicEl.src = data.next.image || '../img/sad-cyclops.png'
   nextEl.innerHTML = data.next.name
+}
+
+function drawOverlays(isPaused) {
+  if (!paused && isPaused) {
+    containerEl.classList.remove('isTurnEnded')
+    containerEl.classList.add('isPaused')
+  }
+  paused = isPaused
+  if (!isPaused) {
+    containerEl.classList.remove('isTurnEnded')
+    containerEl.classList.remove('isPaused')
+    toggleBtn.classList.remove('play')
+    toggleBtn.classList.add('pause')
+  } else {
+    toggleBtn.classList.add('play')
+    toggleBtn.classList.remove('pause')
+  }
+}
+
+ipc.on('rotated', (event, data) => {
+  drawMobbers(data)
+  drawOverlays(true)
+})
+
+ipc.on('skip', () => {
+  skip()
+})
+
+ipc.on('reset', () => {
+  drawOverlays(true)
+  containerEl.classList.remove('isPaused')
+  containerEl.classList.add('isTurnEnded')
+  reset()
+})
+
+ipc.on('pause', () => {
+  drawOverlays(true)
+  pause()
+})
+
+ipc.on('start', () => {
+  drawOverlays(false)
+  start()
 })
 
 ipc.on('paused', () => {
-  paused = true
-  containerEl.classList.add('isPaused')
-  toggleBtn.classList.add('play')
-  toggleBtn.classList.remove('pause')
+  drawOverlays(true)
 })
 
 ipc.on('started', () => {
-  paused = false
-  containerEl.classList.remove('isPaused')
-  containerEl.classList.remove('isTurnEnded')
-  toggleBtn.classList.remove('play')
-  toggleBtn.classList.add('pause')
+  drawOverlays(false)
 })
 
 ipc.on('turnEnded', () => {
-  paused = true
-  containerEl.classList.remove('isPaused')
-  containerEl.classList.add('isTurnEnded')
-  toggleBtn.classList.add('play')
-  toggleBtn.classList.remove('pause')
+  drawInitialState()
 })
 
 ipc.on('configUpdated', (event, data) => {
@@ -109,9 +147,25 @@ ipc.on('stopAlerts', () => {
 })
 
 toggleBtn.addEventListener('click', () => {
-  paused ? ipc.send('unpause') : ipc.send('pause')
+  paused ? start() : pause()
 })
-nextBtn.addEventListener('click', () => ipc.send('skip'))
+nextBtn.addEventListener('click', () => skip())
 configureBtn.addEventListener('click', () => ipc.send('configure'))
 
+function skip() {
+  ipc.send('skip')
+}
+
+function reset() {
+  ipc.send('reset')
+}
+
+function pause() {
+  ipc.send('pause')
+}
+
+function start() {
+  ipc.send('unpause')
+}
+
 ipc.send('timerWindowReady')
diff --git a/src/windows/windows.js b/src/windows/windows.js
old mode 100644
new mode 100755
index acca3a71..f53c8a0c
--- a/src/windows/windows.js
+++ b/src/windows/windows.js
@@ -1,9 +1,12 @@
 const electron = require('electron')
-const { app } = electron
+const { app, BrowserWindow, Menu, Tray } = electron
 const windowSnapper = require('./window-snapper')
 const path = require('path')
+const menuTemplate = require('./menu-template')
+const isMac = process.platform === 'darwin'
+const trayMenu = Menu.buildFromTemplate(menuTemplate.trayMenuTemplate)
 
-let timerWindow, configWindow, fullscreenWindow
+let tray, timerWindow, configWindow, fullscreenWindow
 let snapThreshold, secondsUntilFullscreen, timerAlwaysOnTop
 
 exports.createTimerWindow = () => {
@@ -12,11 +15,13 @@ exports.createTimerWindow = () => {
   }
 
   let { width, height } = electron.screen.getPrimaryDisplay().workAreaSize
-  timerWindow = new electron.BrowserWindow({
-    x: width - 220,
-    y: height - 90,
-    width: 220,
-    height: 90,
+  const timerWinWidth = 220
+  const timerWinHeight = 90
+  timerWindow = new BrowserWindow({
+    x: width - timerWinWidth,
+    y: height - timerWinHeight,
+    width: timerWinWidth,
+    height: timerWinHeight,
     resizable: false,
     alwaysOnTop: timerAlwaysOnTop,
     frame: false,
@@ -25,6 +30,7 @@ exports.createTimerWindow = () => {
 
   timerWindow.loadURL(`file://${__dirname}/timer/index.html`)
   timerWindow.on('closed', () => (timerWindow = null))
+  createApplicationMenu()
 
   timerWindow.on('move', () => {
     if (snapThreshold <= 0) {
@@ -46,6 +52,7 @@ exports.createTimerWindow = () => {
       timerWindow.setPosition(snapTo.x, snapTo.y)
     }
   })
+  exports.timerWindow = timerWindow
 }
 
 exports.showConfigWindow = () => {
@@ -61,7 +68,7 @@ exports.createConfigWindow = () => {
     return
   }
 
-  configWindow = new electron.BrowserWindow({
+  configWindow = new BrowserWindow({
     width: 420,
     height: 500,
     autoHideMenuBar: true
@@ -101,8 +108,13 @@ exports.dispatchEvent = (event, data) => {
   if (event === 'alert' && data === secondsUntilFullscreen) {
     exports.createFullscreenWindow()
   }
-  if (event === 'stopAlerts') {
-    exports.closeFullscreenWindow()
+  if (isMac) {
+    if (event === 'started' || event === 'paused' || event === 'turnEnded') {
+      const menu = Menu.getApplicationMenu()
+      const timerMenu = isMac ? menu.items[1].submenu : menu.items[0].submenu
+      configureTimerMenu(event, timerMenu)
+      configureTimerMenu(event, trayMenu.items[1].submenu)
+    }
   }
 
   if (timerWindow) {
@@ -129,9 +141,39 @@ exports.setConfigState = data => {
   }
 }
 
+exports.createTrayIconAndMenu = () => {
+  if (isMac) {
+    if (!tray) {
+      tray = new Tray(path.join(__dirname, '/../windows/img/trayIcon.png'))
+      tray.setToolTip('Mob Timer')
+    }
+    tray.setContextMenu(trayMenu)
+  }
+}
+
+function configureTimerMenu(event, timerMenu) {
+  switch (event) {
+    case 'started':
+      timerMenu.items[0].visible = false
+      timerMenu.items[1].visible = true
+      timerMenu.items[2].visible = true
+      break
+    case 'paused':
+      timerMenu.items[0].visible = true
+      timerMenu.items[1].visible = false
+      timerMenu.items[2].visible = true
+      break
+    case 'turnEnded':
+      timerMenu.items[0].visible = true
+      timerMenu.items[1].visible = false
+      timerMenu.items[2].visible = false
+      break
+  }
+}
+
 function createAlwaysOnTopFullscreenInterruptingWindow(options) {
   return whileAppDockHidden(() => {
-    const window = new electron.BrowserWindow(options)
+    const window = new BrowserWindow(options)
     window.setAlwaysOnTop(true, 'screen-saver')
     return window
   })
@@ -149,3 +191,11 @@ function whileAppDockHidden(work) {
   }
   return result
 }
+
+function createApplicationMenu() {
+  if (isMac) {
+    const template = menuTemplate.appMenuTemplate
+    const menu = Menu.buildFromTemplate(template)
+    Menu.setApplicationMenu(menu)
+  }
+}

From 52c5f7282c22cdc5a4b2211b3aaeae95356eec8b Mon Sep 17 00:00:00 2001
From: Yash Vyas <yash.vyas.29@gmail.com>
Date: Sat, 11 May 2019 17:48:57 +0530
Subject: [PATCH 2/2] Added tray, app menu and tray menu for mac and refactored
 redundant code to separate functions.

---
 src/windows/menu-template.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/windows/menu-template.js b/src/windows/menu-template.js
index af5f330c..ff3ec98c 100644
--- a/src/windows/menu-template.js
+++ b/src/windows/menu-template.js
@@ -102,7 +102,7 @@ exports.trayMenuTemplate = [
       {
         label: 'Preferences',
         accelerator: 'CommandOrControl+,',
-        click() { exports.showConfigWindow() }
+        click() { windows.showConfigWindow() }
       }
     ]
   },