Feature updates aug (#135)

* update artwork email reply_to * update general email reply to's
Refuge-Worldwide · Aug 13, 2024 · 96d4070 · 96d4070
1 parent 1ee2176
commit 96d4070
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/components/submission/showSubmissionForm.tsx b/components/submission/showSubmissionForm.tsx
@@ -85,6 +85,9 @@ const validationSchema = [
             .shape({
               name: Yup.string().required("Please add an artist name"),
               image: Yup.object().required("Please add an artist image"),
+              email: Yup.string()
+                .required("Please add an email")
+                .email("Invalid email"),
             })
         ),
     }),
@@ -125,6 +128,7 @@ export default function ShowSubmissionForm({
       {
         name: "",
         pronouns: "",
+        email: "",
         bio: "",
         image: "",
       },

diff --git a/components/submission/showSubmissionStep3.tsx b/components/submission/showSubmissionStep3.tsx
@@ -114,6 +114,12 @@ export default function ShowSubmissionStep3({
                           type="text"
                           label="Pronouns"
                         />
+                        <InputField
+                          name={`extraArtists.${index}.email`}
+                          type="email"
+                          label="Email"
+                          required
+                        />
                         <TextareaField
                           name={`extraArtists.${index}.bio`}
                           rows={4}

diff --git a/lib/resend/email.ts b/lib/resend/email.ts
@@ -11,11 +11,7 @@ export async function sendEmail(artist, show, severity) {
       from: "Refuge Worldwide <[email protected]>",
       to: artist.email,
       subject: subject(severity),
-      reply_to: [
-        "[email protected]",
-        "[email protected]",
-        "[email protected]",
-      ],
+      reply_to: ["[email protected]", "[email protected]"],
       react: ShowSubmissionEmail({
         userName: artist.name,
         showDateStart: show.date,
@@ -53,7 +49,6 @@ export async function sendConfirmationEmail(show) {
             reply_to: [
               "[email protected]",
               "[email protected]",
-              "[email protected]",
             ],
             react: ShowSubmissionEmail({
               userName: artist.label,
@@ -93,7 +88,8 @@ export async function sendArtworkEmail(artist, date) {
       reply_to: [
         "[email protected]",
         "[email protected]",
-        "[email protected]",
+        "[email protected]",
+        "[email protected]",
       ],
       react: ShowArtworkEmail({
         userName: artist.name,

diff --git a/pages/api/show-submission-v2.ts b/pages/api/show-submission-v2.ts
@@ -103,6 +103,9 @@ const addArtist = async (artist) => {
         pronouns: {
           "en-US": artist.pronouns,
         },
+        email: {
+          "en-US": [artist.email],
+        },
         role: {
           "en-US": false,
         },

diff --git a/types/shared.d.ts b/types/shared.d.ts
@@ -281,6 +281,7 @@ export type SubmissionFormValues = {
   extraArtists?: Array<{
     name: string;
     pronouns: string;
+    email: string;
     bio?: string;
     image?: string;
   }>;

diff --git a/util.ts b/util.ts
@@ -111,18 +111,18 @@ export const formatArtistNames = (data: ArtistInterface[]) => {
   const names = data.map(({ name }) => name);
 
   if (names.length === 1) {
-    return `With ${names[0]}`;
+    return `with ${names[0]}`;
   }
 
   if (names.length === 2) {
-    return `With ${names[0]} and ${names[1]}`;
+    return `with ${names[0]} and ${names[1]}`;
   }
 
   if (names.length === 3) {
-    return `With ${names.slice(0, 2).join(", ")} and ${names[3]}`;
+    return `with ${names.slice(0, 2).join(", ")} and ${names[3]}`;
   }
 
-  return `With ${names.slice(0, 2).join(", ")} and others`;
+  return `with ${names.slice(0, 2).join(", ")} and others`;
 };
 
 export const getMixcloudKey = (url: string) =>