progress bar

Bump postcss from 8.2.9 to 8.2.10

.github/workflows/release.yml

@@ -1,9 +1,7 @@
 name: Main
 
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch:
 
 jobs:
   build:
@@ -13,10 +11,10 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: "14"
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Build
         run: yarn run dist
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -0,0 +1,36 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.2.0] - 2021-06-01
+
+### Added
+
+- Progress bar
+
+## [1.1.2] - 2021-05-31
+
+### Fixed
+
+- Bug with update window when banner is currently open
+
+## [1.1.1] - 2021-05-28
+
+### Added
+
+- Restore focus to previous window when closing banner
+- Responsive image
+
+### Fixed
+
+- Settings page not opening
+
+## [1.1.0] - 2021-05-15
+
+### Added
+
+- Only pause for a limited time
+- Volume slider for the sound

README.md

@@ -14,6 +14,25 @@ To combat and alleviate the symptoms there is the famous 20/20/20 rule that aims
 
 This is not medical advice. Read more [here](https://en.wikipedia.org/wiki/Computer_vision_syndrome) and [here](https://www.aoa.org/healthy-eyes/eye-and-vision-conditions/computer-vision-syndrome).
 
-## 📦 Install
+## 💻 Installation
 
 Head to the [release page](https://github.com/cupcakearmy/unpixel/releases) and grab the latest for your platform.
+
+- For `macOS` you can downlaod the `.dmg` image.
+- For `Windows` download the `.exe`.
+- For `Linux` either the `.AppImage` or `.deb`, you will know what fits you 😉.
+
+## 🛠 Building / Development
+
+1. Clone the repo
+2. `yarn install`
+3. `yarn dist` to build for all platforms
+
+Alternatively you can run `yarn build` and the `yarn electron-builder -m` for `macOS`, `-l` fir `linux` or `-w` for `windows`.
+
+## 📦 Release
+
+1. Bump version in `package.json`
+2. Update `CHANGELOG.md`
+3. Create a draft release with the new version. (e.g. tag with `v1.2.3`).
+4. Start the publish action and the ci will build and upload assets to the draft matching the version of `package.json` and draft.

package.json

@@ -11,18 +11,18 @@
   "repository": {
     "url": "https://github.com/cupcakearmy/unpixel"
   },
-  "version": "1.0.3",
+  "version": "1.2.0",
   "main": "./dist/back/index.js",
   "scripts": {
     "start": "electron .",
-    "watch:front": "parcel watch --target front --no-hmr --no-cache ./src/front/banner/index.html ./src/front/settings/index.html",
+    "watch:front": "parcel watch --target front --no-hmr --no-cache ./src/front/*/index.html",
     "watch:back": "parcel watch --target back --no-hmr --no-cache ./src/back/index.ts",
     "dev": "run-p watch:*",
-    "build:front": "parcel build --target front ./src/front/banner/index.html ./src/front/settings/index.html",
+    "build:front": "parcel build --target front ./src/front/*/index.html",
     "build:back": "parcel build --target back ./src/back/index.ts",
     "build": "run-s build:*",
     "pack": "electron-builder -mwl",
-    "pack:dev": "electron-builder -m",
+    "pack:dev": "electron-builder -m dir && open ./out/mac/UnPixel.app",
     "dist": "rm -rf .parcel-cache dist && run-s build pack"
   },
   "browserslist": [
@@ -45,6 +45,7 @@
     "dayjs": "^1.10.4",
     "electron-log": "^4.3.2",
     "electron-store": "^7.0.2",
+    "ms": "^2.1.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "semver": "^7.3.5",
@@ -54,14 +55,15 @@
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
     "@types/auto-launch": "^5.0.1",
+    "@types/ms": "^0.7.31",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "@types/semver": "^7.3.4",
     "electron": "^12.0.0",
     "electron-builder": "^22.10.5",
     "npm-run-all": "^4.1.5",
-    "parcel": "next",
-    "postcss": "^8.2.9",
+    "parcel": "^2.0.0-beta.3.1",
+    "postcss": "^8.2.10",
     "typescript": "^4.2.3"
   }
 }

src/back/banner.ts

@@ -1,8 +1,9 @@
 import { join } from 'path'
 import os from 'os'
-import { BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron'
+import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron'
 import dayjs from 'dayjs'
 import logger from 'electron-log'
+import ms from 'ms'
 
 import { DEV } from '.'
 import Settings from './settings'
@@ -15,24 +16,16 @@ export default class Banner {
   static init() {
     if (this.interval) return
     this.interval = setInterval(this.check, 1000)
+    this.check()
     ipcMain.on('close', () => {
       this.close()
     })
   }
 
   static check() {
-    const paused: boolean = Settings.load('paused')
-    if (paused) {
-      TrayUtility.setStatus('Paused')
-      return
-    }
-
-    const every = Settings.load('every')
-    const now = dayjs()
-    const lastRun = Settings.load('lastRun')
-    const diff = every - now.diff(dayjs(lastRun), 'minutes')
-    TrayUtility.setStatus(`Next break: ${diff}m`)
-    if (diff < 1) {
+    TrayUtility.build()
+    const [paused, interval] = Settings.getStatus()
+    if (!paused && interval < 1000) {
       Banner.open()
     }
   }
@@ -49,7 +42,8 @@ export default class Banner {
       },
       width: 1200,
       height: 600,
-      fullscreen: !DEV,
+      fullscreen: true,
+      simpleFullscreen: os.platform() === 'darwin',
     }
     this.window = new BrowserWindow(options)
 
@@ -59,17 +53,6 @@ export default class Banner {
     if (DEV) {
       this.window.webContents.toggleDevTools()
     } else {
-      switch (os.platform()) {
-        case 'win32':
-          break
-        case 'linux':
-          break
-        case 'darwin':
-          this.window.setSimpleFullScreen(true)
-          this.window.setFullScreenable(false)
-          break
-      }
-      // this.window.maximize()
       this.window.setAlwaysOnTop(true, 'floating', 99)
       this.window.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true })
       this.window.setMovable(false)
@@ -81,6 +64,9 @@ export default class Banner {
   static close() {
     if (this.window) {
       Settings.save('lastRun', Date.now())
+      this.window.minimize()
+      this.window.hide()
+      if (process.platform === 'darwin') app.hide()
       this.window.close()
       this.window = null
     }

src/back/settings.ts

@@ -8,15 +8,17 @@ import { productName } from '../../package.json'
 const autoLaunch = new AutoLaunch({ name: productName, mac: { useLaunchAgent: true } })
 
 import { DEV } from '.'
+import dayjs from 'dayjs'
 
 const store = new Store()
 const defaults = {
   every: 20,
   duration: 20,
   boot: true,
-  paused: false,
+  paused: 0,
   lastRun: 0,
   autoClose: false,
+  volume: 100,
 }
 export type SettingKeys = keyof typeof defaults
 const IntNormalizer = (x: any) => parseInt(x)
@@ -26,8 +28,9 @@ const normalizers: Record<SettingKeys, (x: any) => any> = {
   duration: IntNormalizer,
   boot: BoolNormalizer,
   autoClose: BoolNormalizer,
-  paused: BoolNormalizer,
+  paused: IntNormalizer,
   lastRun: IntNormalizer,
+  volume: IntNormalizer,
 }
 
 export default class Settings {
@@ -61,9 +64,9 @@ export default class Settings {
 
   static open() {
     if (this.win) return
-    Settings.win = new BrowserWindow({
+    this.win = new BrowserWindow({
       width: 400,
-      height: 575,
+      height: 630,
       center: true,
       resizable: false,
       webPreferences: {
@@ -71,15 +74,29 @@ export default class Settings {
         contextIsolation: false,
       },
     })
+    this.win.on('closed', () => (this.win = null))
 
     const entry = join(__dirname, '../front/settings/index.html')
-    Settings.win.loadFile(entry)
-    Settings.win.setMenu(null)
+    this.win.loadFile(entry)
+    this.win.setMenu(null)
 
     if (DEV) {
-      Settings.win.setSize(800, 485)
-      Settings.win.setResizable(true)
-      Settings.win.webContents.openDevTools()
+      this.win.setSize(800, 485)
+      this.win.setResizable(true)
+      this.win.webContents.openDevTools()
     }
   }
+
+  static getStatus(): [boolean, number] {
+    const paused: number = this.load('paused')
+    const now = Date.now()
+    if (paused > now) {
+      return [true, paused - now]
+    }
+
+    const every = Settings.load('every')
+    const lastRun = Settings.load('lastRun')
+    const diff = every * 60 * 1000 - dayjs(now).diff(dayjs(lastRun), 'ms')
+    return [false, diff]
+  }
 }

src/back/tray.ts

@@ -1,64 +1,71 @@
 import { Tray, Menu, nativeImage } from 'electron'
 import path from 'path'
+import ms from 'ms'
 
 import Banner from './banner'
 import Settings from './settings'
 
-enum Items {
-  Status = 'status',
-  Pause = 'pause',
-  Run = 'run',
-}
-
 export default class TrayUtility {
-  static menu: Parameters<typeof Menu['buildFromTemplate']>[0] = [
-    { label: 'Status', type: 'normal', enabled: false, id: Items.Status },
-    { type: 'separator' },
-    {
-      label: 'Take a break now',
-      type: 'normal',
-      id: Items.Run,
-      click: () => Banner.open(),
-    },
-    { label: 'Pause', type: 'checkbox', id: Items.Pause },
-    { label: 'Settings', type: 'normal', click: () => Settings.open() },
-    { type: 'separator' },
-    { label: 'Quit', type: 'normal', role: 'quit' },
-  ]
-
   static tray: Tray | null = null
 
-  static setStatus(status: string) {
-    this.menu[0].label = status
-    this.tray?.setContextMenu(this.build())
-  }
+  static build() {
+    const [paused, interval] = Settings.getStatus()
+    const status = paused ? `Paused for: ${ms(interval)}` : `Next break: ${ms(interval)}`
 
-  private static build() {
-    const menu = Menu.buildFromTemplate(this.menu)
-    for (const item of menu.items) {
-      if (item.id === Items.Pause) {
-        let initial = Settings.load('paused')
-        item.checked = initial
-        item.click = () => {
-          initial = !initial
-          item.checked = initial
-          Settings.save('paused', initial)
-        }
-        break
-      }
-    }
-    return menu
+    const template: Parameters<typeof Menu['buildFromTemplate']>[0] = [
+      { label: status, type: 'normal', enabled: false },
+      { type: 'separator' },
+      {
+        label: 'Take a break now',
+        type: 'normal',
+        click: () => Banner.open(),
+      },
+    ]
+
+    template.push(
+      paused
+        ? {
+            label: 'Break pause',
+            click: () => {
+              Settings.save('paused', 0)
+              this.build()
+            },
+          }
+        : {
+            label: 'Pause for...',
+            submenu: Menu.buildFromTemplate(
+              // Minutes to pause
+              [10, 30, 60, 120, 360]
+                .map((minutes) => minutes * 60 * 1000)
+                .map((time) => ({
+                  label: ms(time),
+                  click: () => {
+                    Settings.save('paused', Date.now() + time)
+                    this.build()
+                  },
+                }))
+            ),
+          }
+    )
+
+    template.push(
+      { label: 'Settings', click: () => Settings.open() },
+      { type: 'separator' },
+      { label: 'Quit', role: 'quit' }
+    )
+
+    const menu = Menu.buildFromTemplate(template)
+    this.tray?.setContextMenu(menu)
   }
 
   static init() {
     if (!this.tray) {
       const file = path.join(__dirname, '../../assets/tray.png')
-      const icon = nativeImage.createFromPath(file).resize({
-        width: 24,
-        height: 24,
-      })
-      this.tray = new Tray(icon)
-      this.tray.setContextMenu(this.build())
+      const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
+      resized.setTemplateImage(true)
+      resized.isMacTemplateImage = true
+      this.tray = new Tray(resized)
+      this.build()
     }
   }
 }

src/back/updater.ts

@@ -4,6 +4,7 @@ import logger from 'electron-log'
 import { dialog, shell } from 'electron'
 
 import pkg from '../../package.json'
+import Banner from './banner'
 
 const current = semver.coerce(pkg.version)
 const url = 'https://api.github.com/repos/cupcakearmy/unpixel/tags'
@@ -25,7 +26,9 @@ export default class Updater {
     if (!current) throw new Error('Could not determine current version')
     if (semver.lt(current, latest)) {
       logger.info('New version available')
+      Banner.close()
       dialog
+        // @ts-ignore
         .showMessageBox(null, {
           title: 'Update available',
           message: 'A newer version is available, please download.',
@@ -35,7 +38,6 @@ export default class Updater {
         .then(({ response }) => {
           if (response === 0) {
             shell.openExternal('https://github.com/cupcakearmy/unpixel/releases')
-            process.exit(0)
           }
         })
     } else {

src/front/banner/index.css

@@ -19,11 +19,6 @@ main {
   align-items: center;
 }
 
-h1 {
-  border-bottom: 0.5em solid currentColor;
-  padding-bottom: 0.15em;
-}
-
 .countdown {
   font-size: min(8rem, 25vh);
 }
@@ -58,3 +53,16 @@ button {
 button:hover {
   background-color: #2c2cce;
 }
+
+.progress {
+  width: 100%;
+  height: 3rem;
+  border: 0.125rem solid currentColor;
+}
+
+.progress > div {
+  background-color: currentColor;
+  height: 100%;
+  width: 100%;
+  transition: width ease-out 250ms;
+}

src/front/banner/index.tsx

@@ -1,5 +1,3 @@
-console.log('test')
-
 import { ipcRenderer } from 'electron'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { render } from 'react-dom'
@@ -32,6 +30,8 @@ const Banner: React.FC = () => {
 
   const [done, setDone] = useState(false)
   const [auto, setAuto] = useState(false)
+  const [progress, setProgress] = useState(100)
+  const [max, setMax] = useState(0)
   const [countdown, setCountdown] = useState<null | number>(null)
 
   const handler = useCallback(
@@ -52,21 +52,33 @@ const Banner: React.FC = () => {
       setTimeout(() => setCountdown(countdown - 1), 1000)
     } else {
       const audio = new Audio(chime)
+      const volume = ipcRenderer.sendSync('load', { key: 'volume' })
+      audio.volume = volume / 100
       audio.play()
       setDone(true)
     }
   }, [countdown])
 
+  useEffect(() => {
+    if (countdown !== null) {
+      setProgress((countdown / max) * 100)
+    }
+  }, [countdown, max])
+
   useEffect(() => {
     const autoClose = ipcRenderer.sendSync('load', { key: 'autoClose' })
     setAuto(autoClose)
     const time = ipcRenderer.sendSync('load', { key: 'duration' })
     setCountdown(time)
+    setMax(time)
   }, [])
 
   return (
     <div>
-      <h1 className="ma0 mb4">Look Away</h1>
+      <h1 className="ma0 mb3">Look Away</h1>
+      <div className="progress mb4">
+        <div style={{ width: progress.toFixed(2) + '%' }} />
+      </div>
       <div className="code countdown">{countdown}</div>
       <div className="tile message">
         Look at least <b>6 meters</b> away. <br />

src/front/settings/Field.tsx

@@ -6,6 +6,18 @@ const labels = {
   duration: ['For', 'seconds'],
   boot: ['Start on boot'],
   autoClose: ['Close window after countdown'],
+  volume: ['Chime Volume'],
+}
+
+const ranges: Partial<Record<keyof typeof labels, [number, number]>> = {
+  every: [1, 60],
+  duration: [1, 60],
+  volume: [0, 100],
+}
+
+function getRange(key: keyof typeof labels): [number, number] {
+  const range = ranges[key]
+  return range || [0, 0]
 }
 
 const Field: React.FC<{ setting: keyof typeof labels }> = ({ setting: key }) => {
@@ -39,8 +51,8 @@ const Field: React.FC<{ setting: keyof typeof labels }> = ({ setting: key }) =>
             className="mt0 mb3"
             type="range"
             id={key}
-            min="1"
-            max="60"
+            min={getRange(key)[0]}
+            max={getRange(key)[1]}
             step="1"
             value={value}
             onChange={(e) => setValue(parseInt(e.target.value))}

src/front/settings/Footer.tsx

@@ -9,7 +9,7 @@ const Footer: React.FC = () => {
       <div className="flex justify-center items-center">
         <Link link="https://github.com/cupcakearmy" text="Github" />
         <div className="ph1"> - </div>
-        <Link link="https://nicco.io/support" text="Support" />
+        <Link link="https://nicco.io/support" text="Support / Donate" />
       </div>
       <div className="code o-20 mt1">
         <small>version: {version}</small>

src/front/settings/Settings.tsx

@@ -12,6 +12,7 @@ const Settings = () => {
         <fieldset className="ma0 pa0">
           <Field setting="every" />
           <Field setting="duration" />
+          <Field setting="volume" />
           <Field setting="autoClose" />
           <Field setting="boot" />
         </fieldset>