Merge branch 'main' of github.com:trycompai/comp into mariano/questionaire

Author: Marfuen

.cursor/rules/react-code.mdc

@@ -8,5 +8,6 @@ When writing React code follow these standards:
 - Always export a named component
 - Always name components in PascalCase i.e (MyComponent)
 - Always name files that export components in PascalCase
+- Always round corners to rounded-sm
 - Always try to keep components small and modular
 - Always use sonner instead of toast.

apps/app/package.json

@@ -124,4 +124,4 @@
 	"exports": {
 		"./src/lib/encryption": "./src/lib/encryption.ts"
 	}
-}
+}

apps/app/src/actions/files/upload-file.ts

@@ -55,6 +55,18 @@ export const uploadFile = async (
 		// 1. Decode Base64 Data
 		const fileBuffer = Buffer.from(fileData, "base64");
 
+		// --- Add file size check ---
+		const MAX_FILE_SIZE_MB = 5;
+		const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
+		if (fileBuffer.length > MAX_FILE_SIZE_BYTES) {
+			return {
+				success: false,
+				error: `File exceeds the ${MAX_FILE_SIZE_MB}MB limit.`,
+				data: null,
+			};
+		}
+		// --- End file size check ---
+
 		// 2. Prepare S3 Key
 		const timestamp = Date.now();
 		const sanitizedFileName = fileName.replace(/[^a-zA-Z0-9.-]/g, "_");

apps/app/src/actions/organization/create-organization-action.ts

@@ -16,6 +16,8 @@ import {
 	createOrganizationTasks,
 	getRelevantControls,
 } from "./lib/utils";
+import { env } from "@/env.mjs";
+import ky from "ky";
 
 export const createOrganizationAction = authActionClient
 	.schema(organizationSchema)
@@ -27,7 +29,7 @@ export const createOrganizationAction = authActionClient
 		},
 	})
 	.action(async ({ parsedInput, ctx }) => {
-		const { name, frameworks } = parsedInput;
+		const { name, frameworks, website } = parsedInput;
 		const { id: userId } = ctx.user;
 
 		if (!name) {
@@ -55,6 +57,19 @@ export const createOrganizationAction = authActionClient
 				headers: await headers(),
 			});
 
+			if (env.ZAPIER_HUBSPOT_WEBHOOK_URL) {
+				await ky.post(env.ZAPIER_HUBSPOT_WEBHOOK_URL, {
+					json: {
+						email: session?.user.email,
+						website: website,
+						organization: name,
+						frameworks: frameworks,
+						first_name: session?.user.name?.split(" ")[0] || "",
+						last_name: session?.user.name?.split(" ")[1] || "",
+					},
+				});
+			}
+
 			timings.getAuthSession = (performance.now() - start) / 1000;
 
 			if (!session?.session.activeOrganizationId) {
@@ -97,7 +112,7 @@ export const createOrganizationAction = authActionClient
 			start = performance.now();
 			await db.organization.update({
 				where: { id: organizationId },
-				data: { stripeCustomerId },
+				data: { stripeCustomerId, website },
 			});
 			timings.updateOrganizationWithStripeId =
 				(performance.now() - start) / 1000;

apps/app/src/actions/organization/invite-employee.ts

@@ -45,7 +45,7 @@ export const inviteEmployee = authActionClient
 				});
 
 				// Revalidate the employees list page
-				revalidatePath(`/${organizationId}/employees/all`);
+				revalidatePath(`/${organizationId}/people/all`);
 				revalidateTag(`user_${ctx.user.id}`); // Keep user tag revalidation
 
 				return {

apps/app/src/actions/organization/remove-employee.ts

@@ -108,7 +108,7 @@ export const removeEmployeeRoleOrMember = authActionClient
 					]);
 
 					// Revalidate
-					revalidatePath(`/${organizationId}/employees/all`);
+					revalidatePath(`/${organizationId}/people/all`);
 					revalidateTag(`user_${currentUserId}`);
 
 					return { success: true, data: { removed: true } };
@@ -124,7 +124,7 @@ export const removeEmployeeRoleOrMember = authActionClient
 					});
 
 					// Revalidate
-					revalidatePath(`/${organizationId}/employees/all`);
+					revalidatePath(`/${organizationId}/people/all`);
 					revalidateTag(`user_${currentUserId}`);
 
 					return {

apps/app/src/actions/organization/update-organization-website-action.ts

@@ -0,0 +1,49 @@
+// update-organization-name-action.ts
+
+"use server";
+
+import { db } from "@comp/db";
+import { revalidatePath, revalidateTag } from "next/cache";
+import { authActionClient } from "../safe-action";
+import { organizationWebsiteSchema } from "../schema";
+
+export const updateOrganizationWebsiteAction = authActionClient
+	.schema(organizationWebsiteSchema)
+	.metadata({
+		name: "update-organization-website",
+		track: {
+			event: "update-organization-website",
+			channel: "server",
+		},
+	})
+	.action(async ({ parsedInput, ctx }) => {
+		const { website } = parsedInput;
+		const { activeOrganizationId } = ctx.session;
+
+		if (!website) {
+			throw new Error("Invalid user input");
+		}
+
+		if (!activeOrganizationId) {
+			throw new Error("No active organization");
+		}
+
+		try {
+			await db.$transaction(async () => {
+				await db.organization.update({
+					where: { id: activeOrganizationId ?? "" },
+					data: { website },
+				});
+			});
+
+			revalidatePath("/settings");
+			revalidateTag(`organization_${activeOrganizationId}`);
+
+			return {
+				success: true,
+			};
+		} catch (error) {
+			console.error(error);
+			throw new Error("Failed to update organization website");
+		}
+	});

apps/app/src/actions/schema.ts

@@ -17,6 +17,12 @@ export const organizationSchema = z.object({
 	frameworks: z
 		.array(z.nativeEnum(FrameworkId))
 		.min(1, "Please select at least one framework to get started with"),
+	website: z
+		.string()
+		.url({
+			message: "Please enter a valid website that starts with https://",
+		})
+		.max(255, "Website cannot exceed 255 characters"),
 });
 
 export type OrganizationSchema = z.infer<typeof organizationSchema>;
@@ -61,7 +67,12 @@ export const updaterMenuSchema = z.array(
 );
 
 export const organizationWebsiteSchema = z.object({
-	website: z.string().url().max(255),
+	website: z
+		.string()
+		.url({
+			message: "Please enter a valid website that starts with https://",
+		})
+		.max(255, "Website cannot exceed 255 characters"),
 });
 
 // Risks