Merge pull request #78 from cs3216-a3-group-4/seeleng/fix-onboarding

fix: onboarding
jippy-the-frog · Sep 25, 2024 · 9587775 · 9587775
2 parents 56d21f9 + ad2d7ac
commit 9587775
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/frontend/app/(authenticated)/onboarding/page.tsx b/frontend/app/(authenticated)/onboarding/page.tsx
@@ -17,6 +17,7 @@ export default function Onboarding() {
   const { data: categories, isLoading } = useQuery(getCategories());
   const [categoryIds, setCategoryIds] = useState<number[]>([]);
   const user = useUserStore((state) => state.user);
+  const setLoggedIn = useUserStore((state) => state.setLoggedIn);
 
   const toggleCategory = (id: number) => {
     if (!categoryIds.includes(id)) {
@@ -33,7 +34,8 @@ export default function Onboarding() {
     updateProfileMutation.mutate(
       { categoryIds },
       {
-        onSuccess: () => {
+        onSuccess: (data) => {
+          setLoggedIn(data.data!);
           router.push("/");
         },
       },

diff --git a/frontend/app/(authenticated)/template.tsx b/frontend/app/(authenticated)/template.tsx
@@ -10,17 +10,19 @@ export default function RedirectIfNotAuthenticated({
   children,
 }: Readonly<{ children: React.ReactNode }>) {
   const router = useRouter();
-  const { status } = useQuery(getUserProfile());
+  const { fetchStatus } = useQuery(getUserProfile());
 
   const isLoggedIn = useUserStore((state) => state.isLoggedIn);
   const user = useUserStore((state) => state.user);
-  console.log({ isLoggedIn, status });
 
-  if (!isLoggedIn && !status) {
-    router.push("/login");
-  }
-  if (isLoggedIn && !user!.categories.length) {
-    router.push("/onboarding");
+  if (fetchStatus !== "fetching") {
+    if (!isLoggedIn) {
+      router.push("/login");
+    }
+    console.log("fetching", user);
+    if (isLoggedIn && !user!.categories.length) {
+      router.push("/onboarding");
+    }
   }
 
   return <Suspense>{children}</Suspense>;