From 3b4316f6ffa6d6a04e37041a23df05d3880a6f5c Mon Sep 17 00:00:00 2001
From: Davide Ceschia <davide.ceschia@gmail.com>
Date: Wed, 5 Sep 2018 20:03:15 +0200
Subject: [PATCH] v0.6.1

---
 .travis.yml                                | 17 ++++++++---------
 app/actions/autoUpdater.js                 |  7 +++++--
 app/components/Common/SideBar/SideBar.js   |  9 +++++++--
 app/components/Common/SideBar/SideBar.scss |  5 +++++
 app/constants.js                           |  2 +-
 app/package.json                           |  2 +-
 app/reducers/autoUpdater.js                |  6 ++++--
 package.json                               |  2 +-
 8 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3bc4ace4a..582a72eb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,17 +33,16 @@ matrix:
         - sudo ls -l
         # - node $TRAVIS_BUILD_DIR/scripts/preDeploy.js
       deploy:
-          provider: s3
+          provider: releases
           skip_cleanup: true
-          access_key_id: $AWS_ACCESS_KEY_ID
-          secret_access_key: $AWS_SECRET_ACCESS_KEY
-          bucket: "dl.gorilladevs.com"
-          region: $AWS_DEFAULT_REGION
-          acl: public_read
-          local_dir: $TRAVIS_BUILD_DIR/release
-          upload-dir: releases
+          prerelease: true
+          api_key:
+            secure: hF5RKP28CK3zGjqK++zNxMOjXNvGhq51kcbwV2hiMiBs8JSRVzLWgbemQ0qExVzvn5OxH+3GDlZLCeAfeZBjuC8cRqccWQyQ7OAT27PqW1ZvPCSsG6Xz53z6AC06A3j3DkcougqVSVbRBr6JLDZBlNxeVRle+KUM1f0CdmQJtBH71lYYiafmV/xu1rBG0zJJL60nhln84jiorKSekhVnLzyWH+W2H+a3Shl0/TcGvQAJ1oTCypYjmp7+/4vvRTX2wt016UVeW9UYPowBoJWvia3/5ptMJthoYdibQc0NrCvlx1E4L6HlNnrCSZwnxmP9d0mt5kekpmOu+QijS0OrwGSMADzwxfx34cwcLMoX/4Q/E4X4C6fgTSe8s3NODtfKtiiovgX6tNiTu+eLkV/UuRA3qxQGM9vlbbGv37CNY/VLSNbRsEQQsofTzKXjUZ09WcBrHrML2ZZ1j1TkPlkZBf8ZwyqF2Y4Zou+bRDuER1oAHzsptjap2GIa2F8mZ/im6p6DhlU0MvGo4LSbuJwdj5Gc0G/Yq296OUkvH7ue6LgzTceILygt7q2pwz2TJuEK8Sgs+/3wQ2wmjT3m3h4KMt0T1l/DPyZQbQDTUX/7jwI1ObvEbRLH5C+x5B163rN75MvWCDwPuBkErvRQTLE96h+GuGQZvxz34R84aB4zK0Y=
+          file:
+            - "$TRAVIS_BUILD_DIR/release/GDLauncher-win.zip"
+            - "$TRAVIS_BUILD_DIR/release/GDLauncher-linux.zip"
           on:
-            branch: master
+            tags: true
     - os: osx
       osx_image: xcode9.4
       language: node_js
diff --git a/app/actions/autoUpdater.js b/app/actions/autoUpdater.js
index 463ea84bf..4f70b9c67 100644
--- a/app/actions/autoUpdater.js
+++ b/app/actions/autoUpdater.js
@@ -20,8 +20,11 @@ export function checkForUpdates() {
       const res = await axios.get(UPDATE_URL);
       const actualVersion = packageJson.version;
       // versionsCompare returns positive if v1 > v2, negative if v1 < v2, 0 if they're equal
-      if (versionsCompare(res.data.latestVersion, actualVersion) === 1) {
-        dispatch({ type: UPDATE_AVAILABLE });
+      if (versionsCompare(res.data.version, actualVersion) === 1) {
+        dispatch({
+          type: UPDATE_AVAILABLE,
+          payload: res.data.version
+        });
       }
     } catch (err) {
       console.error(err.message);
diff --git a/app/components/Common/SideBar/SideBar.js b/app/components/Common/SideBar/SideBar.js
index 8aa1350cc..4d4f64476 100644
--- a/app/components/Common/SideBar/SideBar.js
+++ b/app/components/Common/SideBar/SideBar.js
@@ -49,7 +49,11 @@ class SideBar extends Component<Props> {
     return (
       <aside className={styles.sidenav}>
         {this.props.updateAvailable && <div className={styles.updateAvailable}>
-          <Button loading={this.props.updating} onClick={this.props.update} type="primary" size="small" style={{ marginLeft: 5 }}>Update Available</Button>
+          <Button loading={this.props.updating} onClick={this.props.update} type="primary" size="small" style={{ marginLeft: 5 }}>
+            <a href={`https://github.com/gorilla-devs/GDLauncher/releases/tag/v${this.props.latestVersion}`} target="_blank" rel="noopener noreferrer">
+              Update Available ({this.props.latestVersion})
+              </a>
+          </Button>
         </div>}
         <div className={styles.header}>
           <span>
@@ -71,7 +75,7 @@ class SideBar extends Component<Props> {
         <div className={styles.socialsContainer}>
           { /* eslint-disable */}
           <a href="https://twitter.com/gorilladevs" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
-            <i className="fab fa-twitter"/>
+            <i className="fab fa-twitter" />
           </a>
           <a href="https://facebook.com/gorilladevs" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
             <i className="fab fa-facebook"
@@ -102,6 +106,7 @@ function mapStateToProps(state) {
     downloadQueue: state.downloadManager.downloadQueue,
     updateAvailable: state.autoUpdater.updateAvailable,
     updating: state.autoUpdater.checkingForUpdates,
+    latestVersion: state.autoUpdater.latestVersion,
   };
 }
 
diff --git a/app/components/Common/SideBar/SideBar.scss b/app/components/Common/SideBar/SideBar.scss
index 209cf3cd4..5a57576e0 100644
--- a/app/components/Common/SideBar/SideBar.scss
+++ b/app/components/Common/SideBar/SideBar.scss
@@ -13,6 +13,10 @@
     line-height: 40px;
     width: 100%;
     text-align: center;
+    a {
+      text-decoration: none;
+      display: block;
+    }
   }
   .header {
     display: flex;
@@ -89,6 +93,7 @@
   }
   .version {
     color: #7f8c8d;
+    padding-right: 9px;
   }
 }
 
diff --git a/app/constants.js b/app/constants.js
index a99014414..be6403f22 100644
--- a/app/constants.js
+++ b/app/constants.js
@@ -17,5 +17,5 @@ export const LINUX = 'linux';
 export const DARWIN = 'darwin';
 export const NEWS_URL = 'https://minecraft.net/en-us/api/tiles/channel/not_set,Community%20content/region/None/category/Culture,Insider,News/page/1';
 export const JAVA_URL = 'https://java.com/download';
-export const UPDATE_URL = 'https://dl.gorilladevs.com/releases/latest.json';
+export const UPDATE_URL = 'https://raw.githubusercontent.com/gorilla-devs/GDLauncher/master/package.json';
 export const UPDATE_URL_CHECKSUMS = 'https://dl.gorilladevs.com/releases/latestChecksums.json';
diff --git a/app/package.json b/app/package.json
index 3168721e5..9888c3382 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gdlauncher",
   "productName": "GDLauncher",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience",
   "main": "./main.prod.js",
   "author": {
diff --git a/app/reducers/autoUpdater.js b/app/reducers/autoUpdater.js
index 5ff11cbc7..d7e49f883 100644
--- a/app/reducers/autoUpdater.js
+++ b/app/reducers/autoUpdater.js
@@ -6,7 +6,8 @@ import {
 
 const initialState = {
   checkingForUpdates: false,
-  updateAvailable: false
+  updateAvailable: false,
+  latestVersion: null
 };
 
 export default function instancesManager(state = initialState, action) {
@@ -24,7 +25,8 @@ export default function instancesManager(state = initialState, action) {
     case `${UPDATE_AVAILABLE}`:
       return {
         ...state,
-        updateAvailable: true
+        updateAvailable: true,
+        latestVersion: action.payload
       };
     default:
       return state;
diff --git a/package.json b/package.json
index 4fb697f21..31066b5ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gdlauncher",
   "productName": "GDLauncher",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience",
   "scripts": {
     "build": "concurrently \"npm run build-main\" \"npm run build-renderer\"",