From 2361a997fe56099cd9a532a64e61e1aa2eb075bf Mon Sep 17 00:00:00 2001
From: Vincent Taverna <vinnymac@gmail.com>
Date: Fri, 6 Jan 2017 09:08:30 -0500
Subject: [PATCH 1/2] fix minor UI bug on the auth types for login

---
 app/screens/Login/components/LoginFormContainer.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/screens/Login/components/LoginFormContainer.js b/app/screens/Login/components/LoginFormContainer.js
index 2e01864..3f9627d 100644
--- a/app/screens/Login/components/LoginFormContainer.js
+++ b/app/screens/Login/components/LoginFormContainer.js
@@ -55,6 +55,9 @@ const LoginForm = React.createClass({
       authenticating,
     } = this.props
 
+    const isGoogleActive = this.state.authMethod === AUTH_METHODS.google
+    const isPTCActive = this.state.authMethod === AUTH_METHODS.ptc
+
     if (authenticating) {
       return (
         <div className="container">
@@ -72,8 +75,9 @@ const LoginForm = React.createClass({
         <FormGroup>
           <ButtonGroup data-toggle="buttons">
             <Button
-              className="btn btn-info noselect active"
+              className="btn btn-info noselect"
               htmlFor="authGoogle"
+              active={isGoogleActive}
               onClick={this.radioLabelClick.bind(this, AUTH_METHODS.google)}
             >
               <input
@@ -82,7 +86,7 @@ const LoginForm = React.createClass({
                 id="authGoogle"
                 ref={(c) => { this[AUTH_METHODS.google] = c }}
                 value={AUTH_METHODS.google}
-                defaultChecked={this.state.authMethod === AUTH_METHODS.google}
+                defaultChecked={isGoogleActive}
                 onChange={this.handleChangeAuth}
               />
               Google
@@ -90,6 +94,7 @@ const LoginForm = React.createClass({
             <Button
               className="btn btn-info noselect"
               htmlFor="authPTC"
+              active={isPTCActive}
               onClick={this.radioLabelClick.bind(this, AUTH_METHODS.ptc)}
             >
               <input
@@ -98,7 +103,7 @@ const LoginForm = React.createClass({
                 id="authPTC"
                 ref={(c) => { this[AUTH_METHODS.ptc] = c }}
                 value={AUTH_METHODS.ptc}
-                defaultChecked={this.state.authMethod === AUTH_METHODS.ptc}
+                defaultChecked={isPTCActive}
                 onChange={this.handleChangeAuth}
               />
               Pokémon Trainer Club
@@ -195,6 +200,8 @@ const LoginForm = React.createClass({
     const hashingKey = findDOMNode(this.hashKey).value
     const rememberMe = findDOMNode(this.rememberMe).checked
 
+    console.log(method, username, password, hashingKey, rememberMe)
+
     if (!username) {
       ipcRenderer.send('error-message', 'A username is required to login.')
       return

From 591cc5373d4ada2f333026787b7cd1ec4ab270a6 Mon Sep 17 00:00:00 2001
From: Vincent Taverna <vinnymac@gmail.com>
Date: Fri, 6 Jan 2017 10:36:34 -0500
Subject: [PATCH 2/2] fix #183 google login, prepare v2.0.1

---
 README.md                   | 10 +++++-----
 app/actions/authenticate.js |  2 +-
 app/package.json            |  4 ++--
 app/yarn.lock               |  8 ++++----
 package.json                |  4 ++--
 yarn.lock                   |  8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 8a99a94..944ab72 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,12 @@
 
 **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home!
 
-## Downloads for v2.0.0
+## Downloads for v2.0.1
 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases)
-* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.0/PokeNurse.dmg)
-* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.0/PokeNurse.exe)
-* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.0/PokeNurse-ia32.deb)
-* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.0/PokeNurse-x64.deb)
+* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.1/PokeNurse.dmg)
+* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.1/PokeNurse.exe)
+* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.1/PokeNurse-ia32.deb)
+* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.0.1/PokeNurse-x64.deb)
 
 ## Examples
 ![Login Window](app/loginExample.png)
diff --git a/app/actions/authenticate.js b/app/actions/authenticate.js
index 70610ec..4aa99a3 100644
--- a/app/actions/authenticate.js
+++ b/app/actions/authenticate.js
@@ -54,7 +54,7 @@ export default {
 
         const client = new pogobuf.Client(options)
 
-        client.init()
+        await client.init()
 
         setClient(client)
 
diff --git a/app/package.json b/app/package.json
index 57e9954..0526021 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "PokeNurse",
   "productName": "PokeNurse",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "./main.js",
   "author": {
@@ -14,6 +14,6 @@
     "async-file": "^2.0.2",
     "electron-localshortcut": "^1.0.0",
     "node-pogo-protos": "2.4.2",
-    "pogobuf": "1.9.0"
+    "pogobuf": "1.9.1"
   }
 }
diff --git a/app/yarn.lock b/app/yarn.lock
index 88ca4c4..3aa48ea 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -418,7 +418,7 @@ path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-"pcrypt@github:starkevin/pcrypt":
+pcrypt@starkevin/pcrypt:
   version "1.0.0"
   resolved "https://codeload.github.com/starkevin/pcrypt/tar.gz/867562d3a55f41cf2cc542d1e492d5b094c820de"
 
@@ -432,9 +432,9 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pogobuf@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/pogobuf/-/pogobuf-1.9.0.tgz#62f9750e1dc0dba6941a858bcc2cf16176628065"
+pogobuf@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/pogobuf/-/pogobuf-1.9.1.tgz#63cf20f21d3ef350ba652a304c0888efabc4d1a8"
   dependencies:
     bluebird "^3.4.7"
     bluebird-retry "^0.10.1"
diff --git a/package.json b/package.json
index 00c880f..a571b09 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PokeNurse",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "main.js",
   "scripts": {
@@ -139,7 +139,7 @@
     "electron-localshortcut": "^1.0.0",
     "font-awesome": "^4.7.0",
     "node-pogo-protos": "2.4.2",
-    "pogobuf": "1.9.0",
+    "pogobuf": "1.9.1",
     "react": "^15.4.1",
     "react-dom": "^15.4.1",
     "react-redux": "5.0.1",
diff --git a/yarn.lock b/yarn.lock
index ecf3179..8f238bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4960,7 +4960,7 @@ pbkdf2@^3.0.3:
   dependencies:
     create-hmac "^1.1.2"
 
-"pcrypt@github:starkevin/pcrypt":
+pcrypt@starkevin/pcrypt:
   version "1.0.0"
   resolved "https://codeload.github.com/starkevin/pcrypt/tar.gz/867562d3a55f41cf2cc542d1e492d5b094c820de"
 
@@ -5025,9 +5025,9 @@ pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
-pogobuf@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/pogobuf/-/pogobuf-1.9.0.tgz#62f9750e1dc0dba6941a858bcc2cf16176628065"
+pogobuf@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/pogobuf/-/pogobuf-1.9.1.tgz#63cf20f21d3ef350ba652a304c0888efabc4d1a8"
   dependencies:
     bluebird "^3.4.7"
     bluebird-retry "^0.10.1"