From 78d27dcbb1f0fa03e7e60cdf23bd0cc966620cda Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@vagrant.vm>
Date: Thu, 14 Mar 2019 00:55:32 +0000
Subject: [PATCH 1/3] adjusting login.html to match new google sign-in
 migration

---
 Lesson3/step3/templates/login.html | 76 ++++++++++++++----------------
 1 file changed, 35 insertions(+), 41 deletions(-)
diff --git a/Lesson3/step3/templates/login.html b/Lesson3/step3/templates/login.html
index 431d273..b3b7846 100644
--- a/Lesson3/step3/templates/login.html
+++ b/Lesson3/step3/templates/login.html
@@ -1,12 +1,21 @@
 <head>
-
-  <!--LOAD PRE-REQUISITES FOR GOOGLE SIGN IN -->
-   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js">
+    <!-- BEGIN Pre-requisites -->
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js">
+  </script>
+  <script src="https://apis.google.com/js/client:platform.js?onload=start" async defer>
+  </script>
+  <!-- END Pre-requisites -->
+<script>
+    function start() {
+      gapi.load('auth2', function() {
+        auth2 = gapi.auth2.init({
+          client_id: 'CLIENT ID',
+          // Scopes to request in addition to 'profile' and 'email'
+          //scope: 'additional_scope'
+        });
+      });
+    }
   </script>
-
-<script src="//apis.google.com/js/platform.js?onload=start"> </script>
-
-<!-- END PRE-REQUISITES FOR GOOGLE SIGN IN -->
 
 
 </head>
@@ -14,31 +23,22 @@
 
 <body>  
 
-
-<!-- GOOGLE PLUS SIGN IN-->
-
-          
-          <div id="signinButton">
-          <span class="g-signin"
-            data-scope="openid email"
-            data-clientid="13140951618-15nik769cellkubaqnjk5facdib2dh4d.apps.googleusercontent.com"
-            data-redirecturi="postmessage"
-            data-accesstype="offline"
-            data-cookiepolicy="single_host_origin"
-            data-callback="signInCallback"
-            data-approvalprompt="force">
-          </span>
-        </div>
+<button id="signinButton">Sign in with Google</button>
+<script>
+  $('#signinButton').click(function() {
+    // signInCallback defined in step 6.
+    auth2.grantOfflineAccess().then(signInCallback);
+  });
+</script>
 
 <div id="result"></div>
 
+          
 <script>
 function signInCallback(authResult) {
   if (authResult['code']) {
-
     // Hide the sign-in button now that the user is authorized
     $('#signinButton').attr('style', 'display: none');
-
     // Send the one-time-use code to the server, if the server responds, write a 'login successful' message to the web page and then redirect back to the main restaurants page
     $.ajax({
       type: 'POST',
@@ -49,27 +49,21 @@
       success: function(result) {
         // Handle or verify the server response if necessary.
         if (result) {
-          $('#result').html('Login Successful!</br>'+ result + '</br>Redirecting...');
-          setTimeout(function() {
-            window.location.href = "/restaurant";
-          }, 4000);
-        } else if (authResult['error']) {
-          console.log('There was an error: ' + authResult['error']);
-        } else {
-          $('#result').html('Failed to make a server-side call. Check your configuration and console.');
-        }
-      },
-      error: function(result) {
-        console.log('There was an error: ' + result);
+          $('#result').html('Login Successful!</br>'+ result + '</br>Redirecting...')
+         setTimeout(function() {
+          window.location.href = "/restaurant";
+         }, 4000);
+          
+      } else if (authResult['error']) {
+    console.log('There was an error: ' + authResult['error']);
+  } else {
+        $('#result').html('Failed to make a server-side call. Check your configuration and console.');
+         }
       }
       
   }); } }
 </script>
 
-
-
-<!--END GOOGLE PLUS SIGN IN -->
-
   </body>
 
-  </html>
\ No newline at end of file
+  </html>

From 05faf5139a153fcb686ef30443a9ce12d434f904 Mon Sep 17 00:00:00 2001
From: Lorenzo Tomaz <lolo.tomaz@gmail.com>
Date: Thu, 14 Mar 2019 01:14:41 +0000
Subject: [PATCH 2/3] adjusting login.html to match new google sign-in
 migration

---
 Lesson3/step3/templates/login.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Lesson3/step3/templates/login.html b/Lesson3/step3/templates/login.html
index b3b7846..2fad23d 100644
--- a/Lesson3/step3/templates/login.html
+++ b/Lesson3/step3/templates/login.html
@@ -1,3 +1,4 @@
+<html>
 <head>
     <!-- BEGIN Pre-requisites -->
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js">

From c2aa42c84a55cadb83e56c9e7b055a803914f49b Mon Sep 17 00:00:00 2001
From: Lorenzo Tomaz <lolo.tomaz@gmail.com>
Date: Thu, 14 Mar 2019 01:17:07 +0000
Subject: [PATCH 3/3] adjusting login.html to match new google sign-in
 migration

---
 Lesson3/step3/templates/login.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lesson3/step3/templates/login.html b/Lesson3/step3/templates/login.html
index 2fad23d..a15b9e2 100644
--- a/Lesson3/step3/templates/login.html
+++ b/Lesson3/step3/templates/login.html
@@ -5,8 +5,8 @@
   </script>
   <script src="https://apis.google.com/js/client:platform.js?onload=start" async defer>
   </script>
-  <!-- END Pre-requisites -->
-<script>
+
+ <script>
     function start() {
       gapi.load('auth2', function() {
         auth2 = gapi.auth2.init({
@@ -18,6 +18,7 @@
     }
   </script>
 
+ <!-- END Pre-requisites -->
 
 </head>
 
@@ -27,7 +28,6 @@
 <button id="signinButton">Sign in with Google</button>
 <script>
   $('#signinButton').click(function() {
-    // signInCallback defined in step 6.
     auth2.grantOfflineAccess().then(signInCallback);
   });
 </script>
