finished "update app" message feature

AppSaloon · Jan 23, 2017 · 3155dad · 3155dad
1 parent f606a61
commit 3155dad
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/src/app/css/components/_updateMessage.scss b/src/app/css/components/_updateMessage.scss
@@ -6,9 +6,15 @@
     justify-content: center;
     align-items: center;
     top: 0;
-    span {
+    > span {
         border-radius: 5px;
         padding: 10px;
-        background-origin: #e6e6e6;
+        background-color: #e6e6e6;
+        display: flex;
+        align-items: center;
+        flex-flow: column;
+        a {
+            color: blue;
+        }
     }
 }
diff --git a/src/app/html/index.html b/src/app/html/index.html
@@ -10,6 +10,7 @@
         <div id="app"></div>
         <script type="text/javascript">
             window.ipcRenderer = require('electron').ipcRenderer
+            window.shell = require('electron').shell
         </script>
         <script type="text/javascript" src="js/app.js"></script>
     </body>

diff --git a/src/app/js/components/UpdateMessage.js b/src/app/js/components/UpdateMessage.js
@@ -6,28 +6,40 @@ class UpdateMessage extends Component {
 
         this.state = {
             visible: false,
-            error: false
+            error: false,
+            latest: ''
         }
     }
 
-    componentDidMount() {
-        ipcRenderer.on('showUpdateNotification', (event, url) => {
-            this.setState({visible: true, error: false})
+    componentDidMount () {
+        ipcRenderer.on('showUpdateNotification', (event, latest) => {
+            this.setState({visible: true, error: false, latest})
         })
 
         ipcRenderer.on('showUpdateErrorNotification', (event, error) => {
             this.setState({visible: true, error})
         })
     }
 
+    openUrl () {
+        shell.openExternal("https://github.com/AppSaloon/socket.io-tester/releases")
+    }
+
     render () {
         const state = this.state
         const error = state.error
         const errorMessage = Object.prototype.toString.apply(error).slice(8, -1) === 'Object' ? `${error.message} - ${error.documentation_url}` || `Error: ${JSON.stringify(error)}` : `Error: ${JSON.stringify(error)}`
         return (
-            <div className={`update-message ${state.visible ? '' : 'hidden'}`}>
+            <div className={`update-message ${state.visible ? '' : 'hidden'}`} onClick={ () => this.setState({visible: false}) }>
                 { !state.error ?
-                    <span>update please</span>
+                    <span onClick={ e => e.stopPropagation() }>
+                        <span>{`This version of the app is outdated, the latest version is ${state.latest}.`}</span>
+                        <span>
+                            <span>Get it </span>
+                            <a onClick={this.openUrl}>here</a>
+                            <span>.</span>
+                        </span>
+                    </span>
                     :
                     <span>{state.error.message || ''}</span>
                 }

diff --git a/src/electron/checkVersion.js b/src/electron/checkVersion.js
@@ -21,8 +21,8 @@ function getRelease () {
 
             res.on("end", function () {
                 const body = Buffer.concat(chunks)
-                if ( res.statusCode !== 200 ) return reject(body.toString())
-                return resolve(body.toString())
+                if ( res.statusCode !== 200 ) return reject(JSON.parse(body.toString()))
+                return resolve(JSON.parse(body.toString()))
             })
         })
 
@@ -37,16 +37,11 @@ async function checkVersion (appWindow) {
     win = appWindow
     try {
         const release = await getRelease()
-        if ( Object.prototype.toString.apply(release).slice(8, -1) === 'Object' && release.name === version )
-            sendMessageToWindow({channel: 'showUpdateNotification'})
+        if ( Object.prototype.toString.apply(release).slice(8, -1) === 'Object' && release.name !== `v${version}` )
+            sendMessageToWindow({channel: 'showUpdateNotification', message: release.name})
     }
     catch (error) {
-        let parsedError = error
-        try {
-            parsedError = JSON.parse(error)
-        }
-        catch (error) {}
-        sendMessageToWindow({channel: 'showUpdateErrorNotification', message: parsedError})
+        sendMessageToWindow({channel: 'showUpdateErrorNotification', message: error})
     }
 }