From 21be8e526ff000a2d39e0a7ccd5dc19c3d33e12c Mon Sep 17 00:00:00 2001
From: Arik Chakma <arikchangma@gmail.com>
Date: Mon, 3 Apr 2023 23:41:34 +0600
Subject: [PATCH] chore: keep spinner after success to redirect

---
 src/components/Login/GithubLogin.astro | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/Login/GithubLogin.astro b/src/components/Login/GithubLogin.astro
index 17d487c8d..fec6a488c 100644
--- a/src/components/Login/GithubLogin.astro
+++ b/src/components/Login/GithubLogin.astro
@@ -4,7 +4,7 @@ import Spinner from '../Spinner.astro';
 ---
 
 <button
-  class='inline-flex h-10 w-full items-center justify-center rounded border border-slate-300 bg-white p-2 text-sm font-medium text-black outline-none transition duration-150 ease-in-out focus:ring-2 focus:ring-[#333] focus:ring-offset-1 disabled:opacity-60'
+  class='inline-flex h-10 w-full items-center justify-center rounded border border-slate-300 bg-white p-2 text-sm font-medium text-black outline-none transition duration-150 ease-in-out focus:ring-2 focus:ring-[#333] focus:ring-offset-1 disabled:opacity-60 disabled:cursor-not-allowed'
   id='github-login-button'
 >
   <Spinner class='hidden text-black' id='github-login-spinner' />
@@ -60,11 +60,10 @@ import Spinner from '../Spinner.astro';
         }
       })
       .then((data) => {
-        // Remove spinner
-        hideSpinner();
         // Redirect to google login
         if (data.loginUrl) {
           window.location.href = data.loginUrl;
+          githubLoginButton?.removeAttribute('disabled');
         } else {
           // Else throw error
           throw new Error('Something went wrong.');
@@ -110,7 +109,7 @@ import Spinner from '../Spinner.astro';
             Cookies.set(TOKEN_COOKIE_NAME, data.token);
 
             // Redirect to the page the user was on before login
-            history.go(-2);
+            window.location.href = '/';
           } else {
             throw new Error('Something went wrong.');
           }