Merge pull request #28 from hovancik/feature/version-checker

hovancik · web-flow · commit 01e12d4aa909 · 2016-10-12T17:26:49.000+02:00
Adds version checker to check for latest version
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - possibility to pause reminders for different times
 - autostart for Windows and macOS
+- check for latest version on About page
 
 ## [0.2.1] - 2016-10-10
 ### Fixed
diff --git a/app/about.html b/app/about.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
     <title>About stretchly v0.2.1</title>
     <link rel="stylesheet" type="text/css" href="css/app.css">
   </head>
@@ -13,9 +12,13 @@
       <div>
         break time reminder app
       </div>
+      <div class="about-stretchly">
+        <p>
+          To learn more about all of stretchly features and about ways how you can help it, visit it's <a href="https://hovancik.net/stretchly" id="homepage">homepage</a>.
+        </p>
+      </div>
       <div id="about-footer">
-        <a href="https://hovancik.net/stretchly" id="homepage">homepage</a>
-        <a href="https://github.com/hovancik/stretchly/releases" id="update">update</a>
+        latest version: <a href="https://github.com/hovancik/stretchly/releases" id="update">checking...</a>
       </div>
     </div>
     <script>
diff --git a/app/about.js b/app/about.js
@@ -1,4 +1,5 @@
-const shell = require('electron').shell
+let {shell} = require('electron')
+let VersionChecker = require('./utils/versionChecker')
 
 document.getElementById('homepage').addEventListener('click', function (e) {
   e.preventDefault()
@@ -9,3 +10,7 @@ document.getElementById('update').addEventListener('click', function (e) {
   e.preventDefault()
   shell.openExternal('https://github.com/hovancik/stretchly/releases')
 })
+
+new VersionChecker().latest(function (version) {
+  document.getElementById('update').innerHTML = version
+})
diff --git a/app/css/app.css b/app/css/app.css
@@ -62,3 +62,10 @@ body {
   text-decoration: none;
   font-family: 'Lato Thin';
 }
+
+.about-stretchly {
+  font-size: 18px;
+  text-decoration: none;
+  font-family: 'Lato Thin';
+  padding-top: 60px;
+}
diff --git a/app/main.js b/app/main.js
@@ -176,17 +176,6 @@ function getTrayMenu (MicrobreaksPaused) {
   }
 
   trayMenu.push({
-    label: 'About',
-    click: function () {
-      showAboutWindow()
-    }
-  }, {
-    label: 'Settings',
-    click: function () {
-      showSettingsWindow()
-    }
-  }
-  , {
     type: 'separator'
   })
 
@@ -228,6 +217,16 @@ function getTrayMenu (MicrobreaksPaused) {
 
   trayMenu.push({
     type: 'separator'
+  }, {
+    label: 'About',
+    click: function () {
+      showAboutWindow()
+    }
+  }, {
+    label: 'Settings',
+    click: function () {
+      showSettingsWindow()
+    }
   }, {
     label: 'Quit',
     click: function () {
diff --git a/app/utils/VersionChecker.js b/app/utils/VersionChecker.js
@@ -0,0 +1,19 @@
+class VersionChecker {
+  latest (callback) {
+    fetch('https://api.github.com/repos/hovancik/stretchly/releases/latest', {
+      method: 'GET',
+      headers: {'User-Agent': 'hovancik/stretchly'},
+      mode: 'cors',
+      cache: 'default'
+    }).then(function (response) {
+      return response.text()
+    }).then(function (body) {
+      let json = JSON.parse(body)
+      callback(json.tag_name)
+    }).catch(function (ex) {
+      callback('Error getting latest version')
+    })
+  }
+}
+
+module.exports = VersionChecker
diff --git a/package.json b/package.json
@@ -87,7 +87,8 @@
       "describe",
       "beforeEach",
       "afterEach",
-      "Audio"
+      "Audio",
+      "fetch"
     ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@`
`87`	`87`	`"describe",`
`88`	`88`	`"beforeEach",`
`89`	`89`	`"afterEach",`
`90`		`- "Audio"`
	`90`	`+ "Audio",`
	`91`	`+ "fetch"`
`91`	`92`	`]`
`92`	`93`	`}`
`93`	`94`	`}`