Merge pull request #62 from meshhq/taylorhalliday/update-copy

Updated copy

dist/index.d.ts

@@ -12,5 +12,5 @@ export declare const CompileEventEmail: (event: core.Event.Model, club: core.Clu
 export declare const CompilePostEmail: (post: core.Post.Model, club: core.Club.Model, link: string) => Promise<string>;
 export declare const CompileConfirmationEmail: (reservation: core.Event.Reservation, event: core.Event.Model, group: core.Calendar.Group, club: core.Club.Model, url: string) => Promise<string>;
 export declare const CompileWelcomeEmail: (user: core.User.Model, club: core.Club.Model, inviteLink: string) => Promise<string>;
-export declare const CompileInvalidEmailAdminNotification: (adminName: string, invalidEmail: string, club: core.Club.Model) => Promise<string>;
+export declare const CompileInvalidEmailAdminNotification: (invalidEmail: string, club: core.Club.Model) => Promise<string>;
 export declare const CompileServiceEmail: (info: ConfirmationInfo, club: core.Club.Model) => Promise<string>;

dist/index.js

@@ -33,8 +33,8 @@ exports.CompileWelcomeEmail = (user, club, inviteLink) => {
     const path = `${__dirname}/templates/welcome.html`;
     return CompileEmail(path, welcomeInfo, club);
 };
-exports.CompileInvalidEmailAdminNotification = (adminName, invalidEmail, club) => {
-    const invalidEmailInfo = transform.BuildInvalidEmailAdminNotificationContent(adminName, invalidEmail, club);
+exports.CompileInvalidEmailAdminNotification = (invalidEmail, club) => {
+    const invalidEmailInfo = transform.BuildInvalidEmailAdminNotificationContent(club.name, invalidEmail, club);
     const path = `${__dirname}/templates/invalidEmail.html`;
     return CompileEmail(path, invalidEmailInfo, club);
 };

dist/models/invalidEmail.d.ts

@@ -1,6 +1,6 @@
 import { ClubInfo } from './club';
 export interface InvalidEmail {
-    firstName: string;
+    clubName: string;
     invalidEmail: string;
     club: ClubInfo;
 }

dist/transform/transform.d.ts

@@ -8,7 +8,7 @@ import { ClubInfo } from '../models/club';
 export declare const BuildGenericContent: (content: string, club: core.Club.Model) => RichContent;
 export declare const BuildEventContent: (event: core.Event.Model, club: core.Club.Model, link: string) => EventInfo;
 export declare const BuildWelcomeContent: (user: core.User.Model, club: core.Club.Model, inviteLink: string) => WelcomeContent;
-export declare const BuildInvalidEmailAdminNotificationContent: (adminName: string, invalidEmail: string, club: core.Club.Model) => InvalidEmail;
+export declare const BuildInvalidEmailAdminNotificationContent: (clubName: string, invalidEmail: string, club: core.Club.Model) => InvalidEmail;
 export declare const CompileResetPasswordInvalidEmail: (post: core.Post.Model, club: core.Club.Model, link: string) => RichContent;
 export declare const BuildPostContent: (post: core.Post.Model, club: core.Club.Model, link: string) => RichContent;
 export declare const BuildConfirmationContent: (reservation: core.Event.Reservation, event: core.Event.Model, group: core.Calendar.Group, club: core.Club.Model, url: string) => ConfirmationInfo;

dist/transform/transform.js

@@ -47,9 +47,9 @@ exports.BuildWelcomeContent = (user, club, inviteLink) => {
     };
     return welcomeContent;
 };
-exports.BuildInvalidEmailAdminNotificationContent = (adminName, invalidEmail, club) => {
+exports.BuildInvalidEmailAdminNotificationContent = (clubName, invalidEmail, club) => {
     const invalidEmailContent = {
-        firstName: adminName,
+        clubName,
         invalidEmail,
         club: exports.BuildClubInfo(club),
     };

src/index.ts

@@ -101,9 +101,9 @@ export const CompileWelcomeEmail = (user: core.User.Model, club: core.Club.Model
  * @param event The ClubHub user for the email. 
  * @param club The ClubHub club to which the email is associated.
  */
- export const CompileInvalidEmailAdminNotification = (adminName: string, invalidEmail: string, club: core.Club.Model): Promise<string> => {
+ export const CompileInvalidEmailAdminNotification = (invalidEmail: string, club: core.Club.Model): Promise<string> => {
     // Transform our event Info
-    const invalidEmailInfo: InvalidEmail = transform.BuildInvalidEmailAdminNotificationContent(adminName, invalidEmail, club)
+    const invalidEmailInfo: InvalidEmail = transform.BuildInvalidEmailAdminNotificationContent(club.name, invalidEmail, club)
 
     // Compile the template and return the promise.
     const path: string = `${__dirname}/templates/invalidEmail.html`

src/models/invalidEmail.ts

@@ -1,7 +1,7 @@
 import { ClubInfo } from './club'
 
 export interface InvalidEmail {
-    firstName: string
+    clubName: string
     invalidEmail: string
     club: ClubInfo
 }

src/templates/data-prod/invalidEmail.json

@@ -1,4 +1,4 @@
 {
-    "firstName": "{{firstName}}",
+    "clubName": "{{clubName}}",
     "invalidEmail": "{{invalidEmail}}"
 }

src/templates/data/invalidEmail.json

@@ -1,4 +1,4 @@
 {
-    "firstName": "Taylor",
+    "clubName": "Taylor's Car Club",
     "invalidEmail": "taylor@whodis.com"
 }

src/templates/pages/invalidEmail.html

@@ -18,7 +18,7 @@
     <columns class="content-column" small="12">
       <div class="content-container padded-container bottom-border">
         <p class="detail-content">
-          Hi {{invalidEmail.firstName}},
+          Hi {{invalidEmail.clubName}} Admin,
         </p>
         </br>
         <p class="detail-content">

src/transform/transform.ts

@@ -78,9 +78,9 @@ export const BuildWelcomeContent = (user: core.User.Model, club: core.Club.Model
  * @param event The user for the email.
  * @param club The club for the email.
  */
- export const BuildInvalidEmailAdminNotificationContent = (adminName: string, invalidEmail: string, club: core.Club.Model): InvalidEmail => {
+ export const BuildInvalidEmailAdminNotificationContent = (clubName: string, invalidEmail: string, club: core.Club.Model): InvalidEmail => {
     const invalidEmailContent: InvalidEmail = {
-        firstName: adminName,
+        clubName,
         invalidEmail,
         club: BuildClubInfo(club),
     }