Merge pull request #64 from compsci-adl/fix/header-buttons

fix: Header buttons
compsci-adl · Feb 18, 2024 · 0298480 · 0298480
2 parents d175095 + 52bebdb
commit 0298480
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/app/(account)/signin/page.tsx b/src/app/(account)/signin/page.tsx
@@ -6,6 +6,7 @@ import FancyRectangle from '@/components/FancyRectangle';
 import { useSignIn } from '@clerk/clerk-react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import Link from 'next/link';
+import { useRouter } from 'next/navigation';
 import { useForm } from 'react-hook-form';
 import { FcGoogle } from 'react-icons/fc';
 import { z } from 'zod';
@@ -25,6 +26,8 @@ export default function SignInPage() {
         resolver: zodResolver(signInSchema),
     });
 
+    const router = useRouter();
+
     const handleSignIn = form.handleSubmit(async ({ email, password }) => {
         if (!isLoaded) return;
         try {
@@ -35,6 +38,7 @@ export default function SignInPage() {
 
             if (result.status === 'complete') {
                 await setActive({ session: result.createdSessionId });
+                router.push('/');
             } else {
                 console.log(result);
             }

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -28,7 +28,12 @@ export default function Header() {
     });
 
     const checkUserPaid = useSWR<{ paid: boolean }>(['payment'], fetcher.get.query, {
-        isPaused: () => clerkUser.isLoaded && !clerkUser.isSignedIn,
+        isPaused: () => {
+            if (clerkUser.isLoaded && !clerkUser.isSignedIn) {
+                return true;
+            }
+            return !checkUserExists.data?.exists;
+        },
     });
 
     const [isScrolled, setIsScrolled] = useState(false);
@@ -156,15 +161,16 @@ export default function Header() {
                                                 Continue Signing Up
                                             </Button>
                                         )}
-                                        {!checkUserPaid.data?.paid && (
-                                            <Button
-                                                colour="orange"
-                                                href="/settings"
-                                                onClick={closeMenu}
-                                            >
-                                                Continue to payment
-                                            </Button>
-                                        )}
+                                        {checkUserExists.data?.exists &&
+                                            !checkUserPaid.data?.paid && (
+                                                <Button
+                                                    colour="orange"
+                                                    href="/settings"
+                                                    onClick={closeMenu}
+                                                >
+                                                    Continue to payment
+                                                </Button>
+                                            )}
                                         <UserButton
                                             userExists={Boolean(checkUserExists.data?.exists)}
                                             userPaid={Boolean(checkUserPaid.data?.paid)}