From fd40614b93684b1b6fabdb19d633413be6adbd67 Mon Sep 17 00:00:00 2001
From: Ahmad <103906421+ahmadk953@users.noreply.github.com>
Date: Sat, 23 Mar 2024 16:05:31 -0400
Subject: [PATCH] Fixed Infinate Redirect When trying to Login or Signup

---
 app/(platform)/(clerk)/sign-in/[[...signin]]/page.tsx         | 2 +-
 app/(platform)/(clerk)/sign-up/[[...sign-up]]/page.tsx        | 2 +-
 app/(platform)/(dashboard)/layout.tsx                         | 4 ++++
 .../organization/[organizationId]/_components/board-list.tsx  | 1 -
 app/(platform)/layout.tsx                                     | 3 ---
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/(platform)/(clerk)/sign-in/[[...signin]]/page.tsx b/app/(platform)/(clerk)/sign-in/[[...signin]]/page.tsx
index 53e59aa..e25a103 100644
--- a/app/(platform)/(clerk)/sign-in/[[...signin]]/page.tsx
+++ b/app/(platform)/(clerk)/sign-in/[[...signin]]/page.tsx
@@ -1,5 +1,5 @@
 import { SignIn } from '@clerk/nextjs';
 
 export default function Page() {
-  return <SignIn afterSignInUrl='/select-org' />;
+  return <SignIn signUpUrl='/sign-up' afterSignInUrl='/select-org' />;
 }
diff --git a/app/(platform)/(clerk)/sign-up/[[...sign-up]]/page.tsx b/app/(platform)/(clerk)/sign-up/[[...sign-up]]/page.tsx
index 7bf1b23..ffddd06 100644
--- a/app/(platform)/(clerk)/sign-up/[[...sign-up]]/page.tsx
+++ b/app/(platform)/(clerk)/sign-up/[[...sign-up]]/page.tsx
@@ -1,5 +1,5 @@
 import { SignUp } from '@clerk/nextjs';
 
 export default function Page() {
-  return <SignUp afterSignUpUrl='/select-org' />;
+  return <SignUp signInUrl='/sign-in' afterSignUpUrl='/select-org' />;
 }
diff --git a/app/(platform)/(dashboard)/layout.tsx b/app/(platform)/(dashboard)/layout.tsx
index 7c9e054..2e8caf6 100644
--- a/app/(platform)/(dashboard)/layout.tsx
+++ b/app/(platform)/(dashboard)/layout.tsx
@@ -1,6 +1,10 @@
+import { auth } from '@clerk/nextjs/server';
+
 import { Navbar } from './_components/Navbar';
 
 const DashbordLayout = ({ children }: { children: React.ReactNode }) => {
+  auth().protect();
+
   return (
     <div className='h-full'>
       <Navbar />
diff --git a/app/(platform)/(dashboard)/organization/[organizationId]/_components/board-list.tsx b/app/(platform)/(dashboard)/organization/[organizationId]/_components/board-list.tsx
index 74342c8..96e8f06 100644
--- a/app/(platform)/(dashboard)/organization/[organizationId]/_components/board-list.tsx
+++ b/app/(platform)/(dashboard)/organization/[organizationId]/_components/board-list.tsx
@@ -25,7 +25,6 @@ export const BoardList = async () => {
     orderBy: {
       createdAt: 'desc',
     },
-    cacheStrategy: { ttl: 30, swr: 60 },
   });
 
   const availableCount = await getAvailableCount();
diff --git a/app/(platform)/layout.tsx b/app/(platform)/layout.tsx
index 3afccdb..3f66139 100644
--- a/app/(platform)/layout.tsx
+++ b/app/(platform)/layout.tsx
@@ -1,13 +1,10 @@
 import { Toaster } from 'sonner';
-import { auth } from '@clerk/nextjs/server';
 import { ClerkProvider } from '@clerk/nextjs';
 
 import { ModalProvider } from '@/components/providers/modal-provider';
 import { QueryProvider } from '@/components/providers/query-provider';
 
 const PlatformLayout = ({ children }: { children: React.ReactNode }) => {
-  auth().protect();
-
   return (
     <ClerkProvider>
       <QueryProvider>