testing tray

CHANGELOG.md

@@ -5,18 +5,6 @@ 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

package.json

@@ -11,7 +11,7 @@
   "repository": {
     "url": "https://github.com/cupcakearmy/unpixel"
   },
-  "version": "1.2.0",
+  "version": "1.1.1",
   "main": "./dist/back/index.js",
   "scripts": {
     "start": "electron .",
@@ -62,7 +62,7 @@
     "electron": "^12.0.0",
     "electron-builder": "^22.10.5",
     "npm-run-all": "^4.1.5",
-    "parcel": "^2.0.0-beta.3.1",
+    "parcel": "next",
     "postcss": "^8.2.10",
     "typescript": "^4.2.3"
   }

src/back/tray.ts

@@ -60,11 +60,11 @@ export default class TrayUtility {
 
   static init() {
     if (!this.tray) {
-      const file = path.join(__dirname, '../../assets/tray.png')
-      const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
-      resized.setTemplateImage(true)
-      resized.isMacTemplateImage = true
-      this.tray = new Tray(resized)
+      const file = path.join(__dirname, '../../assets/trayTemplate.png')
+      // const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
+      // resized.setTemplateImage(true)
+      // resized.isMacTemplateImage = true
+      this.tray = new Tray(file)
       this.build()
     }
   }

src/back/updater.ts

@@ -4,7 +4,6 @@ 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'
@@ -26,9 +25,7 @@ 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.',
@@ -38,6 +35,7 @@ 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,6 +19,11 @@ main {
   align-items: center;
 }
 
+h1 {
+  border-bottom: 0.5em solid currentColor;
+  padding-bottom: 0.15em;
+}
+
 .countdown {
   font-size: min(8rem, 25vh);
 }
@@ -53,16 +58,3 @@ 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

@@ -30,8 +30,6 @@ 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(
@@ -59,26 +57,16 @@ const Banner: React.FC = () => {
     }
   }, [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 mb3">Look Away</h1>
-      <div className="progress mb4">
-        <div style={{ width: progress.toFixed(2) + '%' }} />
-      </div>
+      <h1 className="ma0 mb4">Look Away</h1>
       <div className="code countdown">{countdown}</div>
       <div className="tile message">
         Look at least <b>6 meters</b> away. <br />