Merge branch 'main' into lewis/comp-onboarding-calendar

Author: claudfuen

apps/app/src/components/animated-layout.tsx

@@ -11,19 +11,19 @@ export function AnimatedLayout({
 	sidebar,
 	isCollapsed,
 }: AnimatedLayoutProps) {
-	return (
-		<div className="flex w-full overflow-hidden">
-			<div
-				className={cn(
-					"flex-shrink-0 border-r bg-background duration-300 ease-in-out hidden md:block",
-					isCollapsed ? "w-[80px]" : "w-[240px]",
-				)}
-			>
-				{sidebar}
-			</div>
-			<div className="flex-1 overflow-auto bg-backgroundSoft">
-				{children}
-			</div>
-		</div>
-	);
+        return (
+                <div className="flex w-full h-screen overflow-hidden">
+                        <div
+                                className={cn(
+                                        "flex-shrink-0 h-full overflow-y-auto border-r bg-background duration-300 ease-in-out hidden md:block",
+                                        isCollapsed ? "w-[80px]" : "w-[240px]",
+                                )}
+                        >
+                                {sidebar}
+                        </div>
+                        <div className="flex-1 overflow-y-auto bg-backgroundSoft">
+                                {children}
+                        </div>
+                </div>
+        );
 }

apps/app/src/utils/auth.ts

@@ -41,11 +41,11 @@ export const auth = betterAuth({
 		"https://dev.trycomp.ai",
 	],
 	advanced: {
-		database: {
-			// This will enable us to fall back to DB for ID generation.
-			// It's important so we can use customs ID's specified in Prisma Schema.
-			generateId: false,
-		},
+                database: {
+                        // This will enable us to fall back to DB for ID generation.
+                        // It's important so we can use custom IDs specified in Prisma Schema.
+                        generateId: false,
+                },
 	},
 	secret: process.env.AUTH_SECRET!,
 	plugins: [

apps/framework-editor/app/lib/auth.ts

@@ -23,11 +23,11 @@ export const auth = betterAuth({
 		provider: "postgresql",
 	}),
 	advanced: {
-		database: {
-			// This will enable us to fall back to DB for ID generation.
-			// It's important so we can use customs ID's specified in Prisma Schema.
-			generateId: false,
-		},
+                database: {
+                        // This will enable us to fall back to DB for ID generation.
+                        // It's important so we can use custom IDs specified in Prisma Schema.
+                        generateId: false,
+                },
 	},
 	secret: process.env.AUTH_SECRET!,
 	plugins: [nextCookies()],

apps/portal/src/app/lib/auth.ts

@@ -14,7 +14,7 @@ export const auth = betterAuth({
   }),
   advanced: {
     // This will enable us to fall back to DB for ID generation.
-    // It's important so we can use customs ID's specified in Prisma Schema.
+    // It's important so we can use custom IDs specified in Prisma Schema.
     generateId: false,
   },
   secret: process.env.AUTH_SECRET!,

packages/analytics/src/server.ts

@@ -29,7 +29,7 @@ export async function track(distinctId: string, eventName: string, properties?:
     event: eventName,
     properties,
   });
-  await serverInstance.shutdown();
+  await serverInstance.flush();
 }
 
 export async function identify(distinctId: string, properties?: Properties) {
@@ -39,13 +39,13 @@ export async function identify(distinctId: string, properties?: Properties) {
     distinctId,
     properties,
   });
-  await serverInstance.shutdown();
+  await serverInstance.flush();
 }
 
 export async function getFeatureFlags(distinctId: string) {
   if (!serverInstance) return {};
 
   const flags = await serverInstance.getAllFlags(distinctId);
-  await serverInstance.shutdown();
+  await serverInstance.flush();
   return flags;
-}
+}