Merge pull request #106 from isd-sgcu/dev

prod
isd-sgcu · Aug 5, 2023 · 383814c · 383814c
2 parents 19e1b25 + b336488
commit 383814c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -40,12 +40,6 @@ const Footer = () => {
                             </p>
                         </div>
                     </div>
-                    <button
-                        onClick={isAuthenticated ? logout : login}
-                        className="text-enter cursor-pointer pb-4 pt-6 text-xs font-light text-gray-200 underline underline-offset-2 hover:no-underline"
-                    >
-                        {isAuthenticated ? 'ออกจาก' : 'เข้าสู่'}ระบบ
-                    </button>
                     <div className="order-2 flex flex-col items-center text-center">
                         <p className="mb-1 font-normal">ขอขอบคุณ</p>
                         {/* size base on figma */}
@@ -148,6 +142,13 @@ const Footer = () => {
                         </div>
                     </div>
                 </div>
+
+                <button
+                    onClick={isAuthenticated ? logout : login}
+                    className="w-full cursor-pointer pb-4 pt-6 text-center text-xs font-light text-gray-200 underline underline-offset-2 hover:no-underline"
+                >
+                    {isAuthenticated ? 'ออกจาก' : 'เข้าสู่'}ระบบ
+                </button>
             </div>
             <div className="flex w-full items-center justify-center gap-4 bg-black p-3">
                 <Link

diff --git a/src/pages/oauth/google.tsx b/src/pages/oauth/google.tsx
@@ -21,7 +21,7 @@ export default function Google() {
 
     useEffect(() => {
         if (isReady) {
-            if (query?.ticket) {
+            if (query?.code) {
                 setMessage('Logging in...');
                 handleLogin(query.code as string);
             } else {