update copy

colorstackorg · Jul 23, 2024 · 7f96332 · 7f96332
1 parent be8947d
commit 7f96332
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/apps/admin-dashboard/app/routes/_dashboard.students.tsx b/apps/admin-dashboard/app/routes/_dashboard.students.tsx
@@ -283,14 +283,14 @@ function StudentDropdown({ activatedAt, airtableUri, id }: StudentInView) {
             </Dropdown.Item>
 
             <Dropdown.Item>
-              <Link to={generatePath(Route['/students/:id/remove'], { id })}>
-                <Trash /> Delete Member
+              <Link target="_blank" to={airtableUri} rel="noopener noreferrer">
+                <ExternalLink /> View Airtable Record
               </Link>
             </Dropdown.Item>
 
             <Dropdown.Item>
-              <Link target="_blank" to={airtableUri} rel="noopener noreferrer">
-                <ExternalLink /> View Airtable Record
+              <Link to={generatePath(Route['/students/:id/remove'], { id })}>
+                <Trash /> Remove Member
               </Link>
             </Dropdown.Item>
           </Dropdown.List>

diff --git a/packages/email-templates/emails/components/email.tsx b/packages/email-templates/emails/components/email.tsx
@@ -132,6 +132,7 @@ Email.Preview = function EmailPreview({ children }: EmailPreviewProps) {
 };
 
 type EmailSignatureProps = {
+  children?: React.ReactNode;
   type?: 'colorstack' | 'jehron';
 };
 
@@ -158,11 +159,12 @@ const EmailSignatureContent: Record<
 };
 
 Email.Signature = function EmailSignature({
+  children,
   type = 'colorstack',
 }: EmailSignatureProps) {
   return (
     <Email.Text marginBottom="0px" marginTop="32px">
-      {EmailSignatureContent[type]}
+      {children || EmailSignatureContent[type]}
     </Email.Text>
   );
 };

diff --git a/packages/email-templates/emails/student-removed.tsx b/packages/email-templates/emails/student-removed.tsx
@@ -3,26 +3,40 @@ import React from 'react';
 import { Email } from './components/email';
 import { type EmailTemplateData } from '../src/types';
 
-export function StudentRemovedEmail(_: EmailTemplateData<'student-removed'>) {
+export function StudentRemovedEmail({
+  firstName,
+}: EmailTemplateData<'student-removed'>) {
   return (
     <Email.Template>
       <Email.Preview>
         You have violated the ColorStack Code of Conduct.
       </Email.Preview>
 
       <Email.Main>
-        <Email.Text>We're here with some unfortunate news.</Email.Text>
+        <Email.Text>Hello {firstName},</Email.Text>
 
         <Email.Text>
-          You have violated the{' '}
+          We are informing you that you have violated the{' '}
           <Email.Link href="https://docs.google.com/document/d/10hIOyIJQAdU4ZTvil5ECmRlM34Ds0dPGFNpg18WQ1js">
             ColorStack Code of Conduct
           </Email.Link>
-          , and as a result you have been permanently banned from the ColorStack
-          community.
+          .
+          <br />
+          <br />
+          There have been reports with evidence of you being disrespectful,
+          harassing, and/or violent. We have a zero-tolerance policy for this
+          type of behavior within our community. As a result, you are being
+          permanently removed from the ColorStack Family.
+          <br />
+          <br />
+          This decision is final.
         </Email.Text>
 
-        <Email.Signature />
+        <Email.Signature>
+          Regards,
+          <br />
+          The ColorStack Team
+        </Email.Signature>
       </Email.Main>
     </Email.Template>
   );

diff --git a/packages/email-templates/src/types.ts b/packages/email-templates/src/types.ts
@@ -67,7 +67,9 @@ export const EmailTemplate = z.discriminatedUnion('name', [
   }),
   BaseEmail.extend({
     name: z.literal('student-removed'),
-    data: z.object({}),
+    data: z.object({
+      firstName: z.string().trim().min(1),
+    }),
   }),
 ]);