fix: auth redirect issue

jedwards1230 · Apr 21, 2024 · 73942d3 · 73942d3
1 parent d0c8c77
commit 73942d3
Show file tree

Hide file tree

Showing 18 changed files with 479 additions and 513 deletions.
diff --git a/client/src/app/(app)/_layout.tsx b/client/src/app/(app)/_layout.tsx
@@ -0,0 +1,13 @@
+import { Redirect } from "expo-router";
+
+import Drawer from "@/components/DrawerNav/Drawer";
+import { useUserData } from "@/hooks/stores/useUserData";
+
+export default function HomeLayout() {
+    const session = useUserData.use.session();
+
+    if (!session) return <Redirect href={{ pathname: "/(auth)" }} />;
+    return <Drawer />;
+}
+
+export { ErrorBoundary } from "expo-router";
diff --git a/client/src/app/(main)/agents.tsx → client/src/app/(app)/agents.tsx b/client/src/app/(main)/agents.tsx → client/src/app/(app)/agents.tsx
diff --git a/client/src/app/(main)/index.tsx → client/src/app/(app)/index.tsx b/client/src/app/(main)/index.tsx → client/src/app/(app)/index.tsx
diff --git a/client/src/app/(auth)/_layout.tsx b/client/src/app/(auth)/_layout.tsx
@@ -1,20 +1,12 @@
-import { Redirect, Stack, useLocalSearchParams } from "expo-router";
+import { Redirect, Stack } from "expo-router";
 
-import { useUser } from "@/hooks/useUser";
+import { useUserData } from "@/hooks/stores/useUserData";
 
 export default function AuthLayout() {
-    const params = useLocalSearchParams();
-    const { loading, data: session } = useUser();
+    const session = useUserData.use.session();
 
-    if (loading) return null;
-    if (session) return <Redirect href={{ pathname: "/(main)", params }} />;
-    return (
-        <Stack screenOptions={{ headerShown: false }}>
-            <Stack.Screen name="index" />
-            <Stack.Screen name="login" />
-            <Stack.Screen name="signup" />
-        </Stack>
-    );
+    if (session) return <Redirect href={{ pathname: "/(app)" }} />;
+    return <Stack screenOptions={{ headerShown: false }} />;
 }
 
 export { ErrorBoundary } from "expo-router";
diff --git a/client/src/app/(main)/_layout.tsx b/client/src/app/(main)/_layout.tsx
diff --git a/client/src/app/_layout.tsx b/client/src/app/_layout.tsx
@@ -12,51 +12,55 @@ import Head from "expo-router/head";
 import { PortalHost } from "@/components/primitives/portal";
 import { Providers } from "@/providers";
 
-export const unstable_settings = { initialRouteName: "(main)" };
+export const unstable_settings = {
+    initialRouteName: "(app)/index",
+    auth: { initialRouteName: "(auth)/index" },
+};
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
 
 export default function RootLayout() {
-	const [loaded, error] = useFonts({
-		SpaceMono: require("../../assets/fonts/SpaceMono-Regular.ttf"),
-		...FontAwesome.font,
-	});
+    const [loaded, error] = useFonts({
+        SpaceMono: require("../../assets/fonts/SpaceMono-Regular.ttf"),
+        ...FontAwesome.font,
+    });
 
-	useEffect(() => {
-		if (error) throw error;
-	}, [error]);
+    useEffect(() => {
+        if (error) throw error;
+    }, [error]);
 
-	useEffect(() => {
-		if (loaded) SplashScreen.hideAsync();
-	}, [loaded]);
+    useEffect(() => {
+        if (loaded) SplashScreen.hideAsync();
+    }, [loaded]);
 
-	return loaded ? <RootProviders /> : null;
+    return loaded ? <RootProviders /> : null;
 }
 
 function RootProviders() {
-	return (
-		<Providers>
-			<Head>
-				<title>myChat</title>
-			</Head>
-			<Stack
-				screenOptions={{
-					headerShown: false,
-					contentStyle: { backgroundColor: "#fff" },
-				}}
-			>
-				<Stack.Screen name="(main)" />
-				<Stack.Screen name="(auth)" />
-				<Stack.Screen name="file/[id]" options={{ presentation: "modal" }} />
-				<Stack.Screen name="agent/index" options={{ presentation: "modal" }} />
-				<Stack.Screen name="agent/[id]" options={{ presentation: "modal" }} />
-				<Stack.Screen name="agent/create/index" />
-				<Stack.Screen name="settings" options={{ presentation: "modal" }} />
-			</Stack>
-			<PortalHost />
-		</Providers>
-	);
+    return (
+        <Providers>
+            <Head>
+                <title>myChat</title>
+            </Head>
+            <Stack
+                initialRouteName="(app)/index.tsx"
+                screenOptions={{
+                    headerShown: false,
+                    contentStyle: { backgroundColor: "#fff" },
+                }}
+            >
+                <Stack.Screen name="(app)" />
+                <Stack.Screen name="(auth)" />
+                <Stack.Screen name="file/[id]" options={{ presentation: "modal" }} />
+                <Stack.Screen name="agent/index" options={{ presentation: "modal" }} />
+                <Stack.Screen name="agent/[id]" options={{ presentation: "modal" }} />
+                <Stack.Screen name="agent/create/index" />
+                <Stack.Screen name="settings" options={{ presentation: "modal" }} />
+            </Stack>
+            <PortalHost />
+        </Providers>
+    );
 }
 
 export { ErrorBoundary } from "expo-router";