Fixes onboarding status and redirects with darkmode issues (#78)

armitage-labs · Mar 26, 2024 · 96b52ac · 96b52ac
1 parent 8fecf07
commit 96b52ac
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 29 deletions.
diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
@@ -1,7 +1,6 @@
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "../globals.css";
-import { NextAuthProvider } from "../providers/nextAuthProvider";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -15,11 +14,5 @@ export default async function AuthLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  return (
-    <NextAuthProvider>
-      <html lang="en">
-        <body className={inter.className}>{children}</body>
-      </html>
-    </NextAuthProvider>
-  );
+  return <>{children}</>;
 }
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
@@ -9,14 +9,14 @@ export default async function DashboardLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en">
+    <div>
       <Header />
       <div className="flex h-screen">
         <SessionRefreshProvider>
           <Sidebar />
           <main className="w-full pt-16">{children}</main>
         </SessionRefreshProvider>
       </div>
-    </html>
+    </div>
   );
 }
diff --git a/src/app/api/onboarding/route.ts b/src/app/api/onboarding/route.ts
@@ -5,33 +5,29 @@ import {
   OnboardingStep,
   getOnboardingStatusForUser,
   saveCreateOnboardingStatusForUser,
+  updateOnboardingStatusForUser,
 } from "./userOnboardingService";
 import { NextRequest, NextResponse } from "next/server";
 import { UpdateOnboardingStatusRequestDto } from "./updateOnboardingStatusRequest.dto";
 
 /**
- * Creates / updates onboarding status
+ * Updates onboarding status
  */
 export async function POST(req: NextRequest) {
   const session = await getServerSession(options);
   let success = false;
-  let onboardingStatus = null;
   if (session?.userId) {
     success = true;
     const updateOnboardingStatusRequest =
       (await req.json()) as UpdateOnboardingStatusRequestDto;
-    onboardingStatus = await getOnboardingStatusForUser(session.userId);
-    if (onboardingStatus == null) {
-      onboardingStatus = await saveCreateOnboardingStatusForUser(
-        session.userId,
-        updateOnboardingStatusRequest.onboardingFlow,
-        updateOnboardingStatusRequest.onboardingStep,
-      );
-    }
+    await updateOnboardingStatusForUser(
+      session.userId,
+      updateOnboardingStatusRequest.onboardingFlow,
+      updateOnboardingStatusRequest.onboardingStep,
+    );
   }
   return NextResponse.json({
     success: success,
-    onboardingStatus: onboardingStatus,
   });
 }
 

diff --git a/src/app/api/onboarding/userOnboardingService.ts b/src/app/api/onboarding/userOnboardingService.ts
@@ -4,6 +4,7 @@ export enum OnboardingFlow {
   UNKNOWN,
   PRIVATE,
   PUBLIC,
+  BETA,
 }
 
 export enum OnboardingStep {
@@ -25,6 +26,31 @@ export async function getOnboardingStatusForUser(
   return userOnboarding;
 }
 
+export async function updateOnboardingStatusForUser(
+  userId: string,
+  flow: OnboardingFlow,
+  step: OnboardingStep,
+) {
+  const userOnboarding = await prisma.userOnboarding.findFirst({
+    where: {
+      user_id: userId,
+    },
+  });
+  if (userOnboarding !== null) {
+    await prisma.userOnboarding.update({
+      where: {
+        user_id: userId,
+        id: userOnboarding.id,
+      },
+      data: {
+        flow: OnboardingFlow[flow],
+        flow_step: OnboardingStep[step],
+        updated_at: new Date(),
+      },
+    });
+  }
+}
+
 export async function saveCreateOnboardingStatusForUser(
   userId: string,
   flow: OnboardingFlow,

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -18,7 +18,7 @@ export default async function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en">
+    <html lang="en" suppressHydrationWarning>
       <body className={`${inter.className}`}>
         <Providers>
           <NextAuthProvider>

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -4,6 +4,10 @@ import { UserOnboarding } from "@prisma/client";
 import axios from "axios";
 import { redirect } from "next/navigation";
 import { useEffect, useState } from "react";
+import {
+  OnboardingFlow,
+  OnboardingStep,
+} from "./api/onboarding/userOnboardingService";
 
 export default function Home() {
   const [userOnboardingStatus, setUserOnboarding] = useState<UserOnboarding>();
@@ -15,17 +19,25 @@ export default function Home() {
     }
   };
 
+  const handleUpdateUserOnboarding = async () => {
+    await axios.post("/api/onboarding", {
+      onboardingFlow: OnboardingFlow.BETA,
+      onboardingStep: OnboardingStep.COMPLETED,
+    });
+  };
+
   useEffect(() => {
     handleFetchUserOnboarding();
   }, []);
 
   useEffect(() => {
-    // if (userOnboardingStatus?. === "completed") {
-    //   redirect("/repositories/new");
-    // } else {
-    redirect("/overview");
-    // }
+    if (userOnboardingStatus) {
+      if (userOnboardingStatus.flow.toLowerCase() !== "beta") {
+        handleUpdateUserOnboarding();
+        redirect("/repositories/new");
+      } else {
+        redirect("/overview");
+      }
+    }
   }, [userOnboardingStatus]);
-
-  redirect("/overview");
 }