Fix codebility build issues

Author: Jecomo-Alyssa-Lyn

apps/codebility/app/auth/onboarding/page.tsx

@@ -1,24 +1,11 @@
-<<<<<<< HEAD
-// app/auth/onboarding/page.tsx (patched)
-
-=======
->>>>>>> origin/dev
+// app/auth/onboarding/page.tsx
 "use client";
 
 import { useRef } from "react";
-
-import IsRoadMap from "./_components/RoadMap/IsRoadMap";
-import ExpectFromUsWrapper from "./ExpectFromUsWrapper";
 import ExpectSectionWrapper from "./ExpectSectionWrapper";
 import HouseRulesSectionWrapper from "./HouseRulesSectionWrapper";
-import IsAndIsntSectionWrapper from "./IsAndIsntSectionWrapper";
-import IsNotSectionWrapper from "./IsNotSectionWrapper";
-import MindsetSectionWrapper from "./MindsetSectionWrapper";
 import OnboardingClientWrapper from "./OnboardingClientWrapper";
-
-
 import OnboardingStepper from "./OnboardingStepper";
-
 import PartnersSectionWrapper from "./PartnersSectionWrapper";
 import RoadMapWrapper from "./RoadMapSectionWrapper";
 import SoftwareSectionWrapper from "./SoftwareSectionWrapper";
@@ -27,60 +14,42 @@ import WellcomeSectionWrapper from "./WellcomeSectionWrapper";
 
 export default function OnboardingPage() {
   const roadmapRef = useRef<HTMLDivElement>(null);
-
+  
   return (
     <main className="relative min-h-screen">
-
-      <OnboardingClientWrapper />
-      <SoftwareSectionWrapper />
-      {/* <MindsetSectionWrapper /> */}
-      <ExpectSectionWrapper />
-      {/* <IsAndIsntSectionWrapper /> */}
-      {/* <IsNotSectionWrapper /> */}
-      {/* <ExpectFromUsWrapper /> */}
-      <RoadMapWrapper roadmapRef={roadmapRef} />
-      <HouseRulesSectionWrapper />
-      <TeamSectionWrapper />
-      <PartnersSectionWrapper />
-      <WellcomeSectionWrapper />
-    </main>
-  );
-}
-
       {/* Vertical stepper navigation */}
       <OnboardingStepper />
-
+      
       <OnboardingClientWrapper />
-
+      
       {/* Each section wrapped with ID for stepper tracking */}
       <section id="software">
         <SoftwareSectionWrapper />
       </section>
-
+      
       <section id="expect">
         <ExpectSectionWrapper />
       </section>
-
+      
       <section id="roadmap">
         <RoadMapWrapper roadmapRef={roadmapRef} />
       </section>
-
+      
       <section id="house-rules">
         <HouseRulesSectionWrapper />
       </section>
-
+      
       <section id="team">
         <TeamSectionWrapper />
       </section>
-
+      
       <section id="partners">
         <PartnersSectionWrapper />
       </section>
-
+      
       <section id="welcome">
         <WellcomeSectionWrapper />
       </section>
     </main>
   );
-}
-
+}

apps/codebility/app/home/layout.tsx

@@ -6,7 +6,7 @@ import { ThemeProvider } from "@/context/ThemeProvider";
 import ReactQueryProvider from "@/hooks/reactQuery";
 import { UserProvider } from "@/store/UserProvider";
 import { AppRouterCacheProvider } from "@mui/material-nextjs/v14-appRouter";
-import { Toaster } from "@codevs/ui/sonner/toast";
+import { Toaster } from "sonner";
 
 
 import ToastNotification from "./_components/HomeToastNotification";
@@ -18,6 +18,7 @@ import { PageTransitionSettings } from "./_components/PageTransitionSettings";
 import { MuiStyleRoot } from "./(dashboard)/_components/DashboardRoadmapStyleRoot";
 import ConditionalMainWrapper from "./_components/ConditionalMainWrapper";
 import DynamicMainContent from "./_components/DynamicMainContent";
+import { Toast } from "@codevs/ui/toast";
 
 // Force dynamic rendering for layout due to server-side Supabase usage
 export const dynamic = "force-dynamic";

apps/codebility/components/notifications/NotificationContainer.tsx

@@ -6,7 +6,7 @@ import { NotificationIcon } from "./NotificationIcon";
 import { NotificationPanel } from "./NotificationPanel";
 import { createClientClientComponent } from "@/utils/supabase/client";
 import { useUserStore } from "@/store/codev-store";
-import { toast } from "@codevs/ui/sonner/toast";
+import { toast } from "sonner";
 
 
 export function NotificationContainer() {