From 526775df91e27cb29d8be06ec7cc0386e2a7164b Mon Sep 17 00:00:00 2001
From: Rami Abdou <ramiabdou98@gmail.com>
Date: Mon, 22 Sep 2025 17:01:12 -0700
Subject: [PATCH 1/5] fix seed script

---
 packages/db/src/scripts/seed.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/db/src/scripts/seed.ts b/packages/db/src/scripts/seed.ts
index 72672727c..df7771c00 100644
--- a/packages/db/src/scripts/seed.ts
+++ b/packages/db/src/scripts/seed.ts
@@ -11,6 +11,8 @@ if (IS_PRODUCTION) {
   throw new Error('Cannot seed database in non-development environment.');
 }
 
+let email = '';
+
 main();
 
 async function main() {
@@ -37,8 +39,6 @@ async function main() {
   }
 }
 
-let email = '';
-
 function setEmailFromCommandLine() {
   const answer = prompt(
     'In order to log into the Member Profile and Admin Dashboard, you will need both a member record and an admin record. Please provide an email so we can create those for you.\n' +

From 2f8753f4bc732265b19b1dd00c39de9f0eeec949 Mon Sep 17 00:00:00 2001
From: Rami Abdou <ramiabdou98@gmail.com>
Date: Mon, 22 Sep 2025 17:21:20 -0700
Subject: [PATCH 2/5] remove slack and github from important resources

---
 apps/member-profile/app/routes/_profile.home.tsx | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/apps/member-profile/app/routes/_profile.home.tsx b/apps/member-profile/app/routes/_profile.home.tsx
index 3ee586911..b9dc2ffa2 100644
--- a/apps/member-profile/app/routes/_profile.home.tsx
+++ b/apps/member-profile/app/routes/_profile.home.tsx
@@ -424,13 +424,6 @@ function ImportantResourcesCard() {
       <Card.Title>Important Resources</Card.Title>
 
       <ul className="flex flex-col gap-3">
-        <ResourceItem
-          description="The heartbeat of our community."
-          href="https://colorstack-family.slack.com/"
-        >
-          Slack
-        </ResourceItem>
-
         <ResourceItem
           description="A collection of career, community, and academic related resources."
           href="https://wiki.colorstack.org/the-colorstack-family"
@@ -445,13 +438,6 @@ function ImportantResourcesCard() {
           Chapters
         </ResourceItem>
 
-        <ResourceItem
-          description="The codebase where our software, called Oyster, lives. Go read + contribute to the codebase!"
-          href="https://github.com/colorstackorg/oyster"
-        >
-          GitHub
-        </ResourceItem>
-
         <ResourceItem
           description="A collection of our past event recordings. Don't miss a beat!"
           href="https://youtube.com/@colorstackinc.2266"

From d50a42219661409acd67e448c9e8e36813bab634 Mon Sep 17 00:00:00 2001
From: Rami Abdou <ramiabdou98@gmail.com>
Date: Mon, 22 Sep 2025 17:21:54 -0700
Subject: [PATCH 3/5] remove slack screen

---
 .../app/routes/onboarding.community.tsx       | 10 ++-
 .../app/routes/onboarding.slack.tsx           | 83 -------------------
 apps/member-profile/app/routes/onboarding.tsx |  9 +-
 apps/member-profile/app/shared/constants.ts   |  1 -
 4 files changed, 10 insertions(+), 93 deletions(-)
 delete mode 100644 apps/member-profile/app/routes/onboarding.slack.tsx

diff --git a/apps/member-profile/app/routes/onboarding.community.tsx b/apps/member-profile/app/routes/onboarding.community.tsx
index 8d95415a7..91f0d0a55 100644
--- a/apps/member-profile/app/routes/onboarding.community.tsx
+++ b/apps/member-profile/app/routes/onboarding.community.tsx
@@ -97,9 +97,15 @@ export async function action({ request }: ActionFunctionArgs) {
     await updateMember(memberId, {
       ...result.data,
       ethnicities: result.data.ethnicities || [],
+      onboardedAt: new Date(),
     });
 
-    return redirect(Route['/onboarding/slack']);
+    const url = new URL(request.url);
+
+    url.pathname = Route['/home'];
+    url.searchParams.set('new', '1');
+
+    return redirect(url.toString());
   } catch (e) {
     return data({ error: (e as Error).message }, { status: 500 });
   }
@@ -221,7 +227,7 @@ export default function OnboardingCommunityForm() {
 
       <OnboardingButtonGroup>
         <OnboardingBackButton to="/onboarding/emails" />
-        <OnboardingContinueButton />
+        <OnboardingContinueButton label="Finish" />
       </OnboardingButtonGroup>
     </Form>
   );
diff --git a/apps/member-profile/app/routes/onboarding.slack.tsx b/apps/member-profile/app/routes/onboarding.slack.tsx
deleted file mode 100644
index ab9ff9503..000000000
--- a/apps/member-profile/app/routes/onboarding.slack.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import {
-  type ActionFunctionArgs,
-  Form,
-  type LoaderFunctionArgs,
-  redirect,
-  useActionData,
-  useLoaderData,
-} from 'react-router';
-
-import { job } from '@oyster/core/bull';
-import { db } from '@oyster/db';
-import { ErrorMessage, getErrors } from '@oyster/ui';
-
-import {
-  OnboardingBackButton,
-  OnboardingButtonGroup,
-  OnboardingContinueButton,
-  OnboardingSectionDescription,
-  OnboardingSectionTitle,
-} from '@/routes/onboarding';
-import { Route } from '@/shared/constants';
-import { ensureUserAuthenticated, user } from '@/shared/session.server';
-
-export async function loader({ request }: LoaderFunctionArgs) {
-  const session = await ensureUserAuthenticated(request);
-
-  const member = await db
-    .selectFrom('students')
-    .select('email')
-    .where('id', '=', user(session))
-    .executeTakeFirstOrThrow();
-
-  return {
-    email: member.email,
-  };
-}
-
-export async function action({ request }: ActionFunctionArgs) {
-  const session = await ensureUserAuthenticated(request);
-
-  const member = await db
-    .updateTable('students')
-    .set({ onboardedAt: new Date() })
-    .where('id', '=', user(session))
-    .returning(['email', 'slackId'])
-    .executeTakeFirst();
-
-  if (member && !member.slackId) {
-    job('slack.invite', { email: member.email });
-  }
-
-  const url = new URL(request.url);
-
-  url.pathname = Route['/home'];
-  url.searchParams.set('new', '1');
-
-  return redirect(url.toString());
-}
-
-export default function OnboardingSlackForm() {
-  const { email } = useLoaderData<typeof loader>();
-  const actionData = useActionData<typeof action>();
-  const { error } = getErrors(actionData);
-
-  return (
-    <Form className="form" method="post">
-      <OnboardingSectionTitle>Slack</OnboardingSectionTitle>
-
-      <OnboardingSectionDescription>
-        After you click "Finish", we'll send you a Slack invitation to your
-        email, <span className="font-bold">{email}</span>. Be sure to accept
-        that invitation right after you check out your Member Profile! 🎉
-      </OnboardingSectionDescription>
-
-      <ErrorMessage>{error}</ErrorMessage>
-
-      <OnboardingButtonGroup>
-        <OnboardingBackButton to="/onboarding/community" />
-        <OnboardingContinueButton label="Finish" />
-      </OnboardingButtonGroup>
-    </Form>
-  );
-}
diff --git a/apps/member-profile/app/routes/onboarding.tsx b/apps/member-profile/app/routes/onboarding.tsx
index 6b5db87b4..85129d56c 100644
--- a/apps/member-profile/app/routes/onboarding.tsx
+++ b/apps/member-profile/app/routes/onboarding.tsx
@@ -65,19 +65,17 @@ function ProgressBar() {
   }
 
   return (
-    <div className="mx-auto my-4 grid w-full grid-cols-11 items-center sm:px-4">
+    <div className="mx-auto my-4 grid w-full grid-cols-5 items-center sm:px-4">
       <ProgressBarStep step="1" />
       <ProgressBarLine step="2" />
       <ProgressBarStep step="2" />
       <ProgressBarLine step="3" />
       <ProgressBarStep step="3" />
-      <ProgressBarLine step="4" />
-      <ProgressBarStep step="4" />
     </div>
   );
 }
 
-type ProgressStep = '1' | '2' | '3' | '4';
+type ProgressStep = '1' | '2' | '3';
 
 type ProgressBarStepProps = {
   step: ProgressStep;
@@ -113,14 +111,12 @@ const STEP_TO_ROUTE_MAP: Record<ProgressStep, string> = {
   '1': Route['/onboarding/general'],
   '2': Route['/onboarding/emails'],
   '3': Route['/onboarding/community'],
-  '4': Route['/onboarding/slack'],
 };
 
 const STEP_LABEL_MAP: Record<ProgressStep, string> = {
   '1': 'General',
   '2': 'Email',
   '3': 'Community',
-  '4': 'Slack',
 };
 
 function ProgressBarStepLabel({ step }: ProgressBarStepProps) {
@@ -163,7 +159,6 @@ const ROUTE_TO_STEP_MAP: Record<string, ProgressStep> = {
   [Route['/onboarding/emails']]: '2',
   [Route['/onboarding/emails/verify']]: '2',
   [Route['/onboarding/community']]: '3',
-  [Route['/onboarding/slack']]: '4',
 };
 
 type StepStatus = 'active' | 'completed' | 'inactive';
diff --git a/apps/member-profile/app/shared/constants.ts b/apps/member-profile/app/shared/constants.ts
index 5b4d21375..a21da9943 100644
--- a/apps/member-profile/app/shared/constants.ts
+++ b/apps/member-profile/app/shared/constants.ts
@@ -28,7 +28,6 @@ const ROUTES = [
   '/onboarding/emails',
   '/onboarding/emails/verify',
   '/onboarding/general',
-  '/onboarding/slack',
   '/offers',
   '/offers/full-time',
   '/offers/full-time/add',

From f65fb518b7f743940b95104faf9882e21e86a144 Mon Sep 17 00:00:00 2001
From: Rami Abdou <ramiabdou98@gmail.com>
Date: Mon, 22 Sep 2025 17:34:27 -0700
Subject: [PATCH 4/5] onboarding session card

---
 .../app/routes/_profile.home.tsx              | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/apps/member-profile/app/routes/_profile.home.tsx b/apps/member-profile/app/routes/_profile.home.tsx
index b9dc2ffa2..fa2e5018e 100644
--- a/apps/member-profile/app/routes/_profile.home.tsx
+++ b/apps/member-profile/app/routes/_profile.home.tsx
@@ -172,9 +172,9 @@ async function getStudent(id: string) {
       'students.lastName',
       'students.number',
       (eb) => {
-        return eb('onboardingSessionAttendees.id', 'is not', null).as(
-          'attendedOnboardingSession'
-        );
+        return eb('onboardingSessionAttendees.id', 'is', null)
+          .and('students.acceptedAt', '>=', new Date('2025-09-01'))
+          .as('showOnboardingSessionCard');
       },
     ])
     .where('students.id', '=', id)
@@ -235,6 +235,7 @@ export default function HomeLayout() {
 
       <div className="grid grid-cols-1 items-start gap-4 @[900px]:grid-cols-2 @[1500px]:grid-cols-3">
         <Home.Column>
+          {student.showOnboardingSessionCard && <OnboardingSessionCard />}
           <ActiveStatusCard />
 
           <div className="gap-[inherit] @container">
@@ -328,6 +329,30 @@ function ActiveStatusCard() {
   );
 }
 
+function OnboardingSessionCard() {
+  return (
+    <Card>
+      <Card.Title>Attend an Onboarding Session</Card.Title>
+
+      <Card.Description>
+        Learn more about ColorStack, meet other members and gain access to our
+        Slack workspace!
+      </Card.Description>
+
+      <Button.Group>
+        <Button.Slot variant="primary">
+          <Link
+            target="_blank"
+            to="https://calendly.com/colorstack-onboarding-ambassador/onboarding"
+          >
+            Book Onboarding Session <ExternalLink size={16} />
+          </Link>
+        </Button.Slot>
+      </Button.Group>
+    </Card>
+  );
+}
+
 function MessagesSentCard() {
   const { messagesSentCount } = useLoaderData<typeof loader>();
 

From b5bc2dc5cc1d54e6a5edacabfc7deb9aeba94436 Mon Sep 17 00:00:00 2001
From: Rami Abdou <ramiabdou98@gmail.com>
Date: Mon, 22 Sep 2025 17:43:50 -0700
Subject: [PATCH 5/5] invite after uploading

---
 .../add-onboarding-session-attendees.ts          | 16 +++++++++++++---
 .../use-cases/upload-onboarding-session.ts       | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/modules/onboarding-sessions/use-cases/add-onboarding-session-attendees.ts b/packages/core/src/modules/onboarding-sessions/use-cases/add-onboarding-session-attendees.ts
index 8bfb34924..9192af331 100644
--- a/packages/core/src/modules/onboarding-sessions/use-cases/add-onboarding-session-attendees.ts
+++ b/packages/core/src/modules/onboarding-sessions/use-cases/add-onboarding-session-attendees.ts
@@ -19,7 +19,7 @@ export async function addOnboardingSessionAttendees(
     .where('id', '=', onboardingSessionId)
     .executeTakeFirstOrThrow();
 
-  await db.transaction().execute(async (trx) => {
+  const attendees = await db.transaction().execute(async (trx) => {
     await Promise.all(
       input.attendees.map(async (studentId) => {
         await trx
@@ -40,12 +40,22 @@ export async function addOnboardingSessionAttendees(
           .execute();
       })
     );
+
+    return trx
+      .selectFrom('students')
+      .select(['email', 'id', 'slackId'])
+      .where('id', 'in', input.attendees)
+      .execute();
   });
 
-  input.attendees.forEach((studentId) => {
+  attendees.forEach((attendee) => {
     job('onboarding_session.attended', {
       onboardingSessionId,
-      studentId,
+      studentId: attendee.id,
     });
+
+    if (!attendee.slackId) {
+      job('slack.invite', { email: attendee.email });
+    }
   });
 }
diff --git a/packages/core/src/modules/onboarding-sessions/use-cases/upload-onboarding-session.ts b/packages/core/src/modules/onboarding-sessions/use-cases/upload-onboarding-session.ts
index 2574429b7..62d63a1be 100644
--- a/packages/core/src/modules/onboarding-sessions/use-cases/upload-onboarding-session.ts
+++ b/packages/core/src/modules/onboarding-sessions/use-cases/upload-onboarding-session.ts
@@ -16,7 +16,7 @@ export async function uploadOnboardingSession(
 ) {
   const onboardingSessionId = id();
 
-  await db.transaction().execute(async (trx) => {
+  const attendees = await db.transaction().execute(async (trx) => {
     await trx
       .insertInto('onboardingSessions')
       .values({
@@ -45,12 +45,22 @@ export async function uploadOnboardingSession(
           .execute();
       })
     );
+
+    return trx
+      .selectFrom('students')
+      .select(['email', 'id', 'slackId'])
+      .where('id', 'in', input.attendees)
+      .execute();
   });
 
-  input.attendees.forEach((studentId) => {
+  attendees.forEach((attendee) => {
     job('onboarding_session.attended', {
       onboardingSessionId,
-      studentId,
+      studentId: attendee.id,
     });
+
+    if (!attendee.slackId) {
+      job('slack.invite', { email: attendee.email });
+    }
   });
 }