diff --git a/client/src/components/MakeReceipt/MakeReceipt.jsx b/client/src/components/MakeReceipt/MakeReceipt.jsx index 1962932c..e6886d27 100644 --- a/client/src/components/MakeReceipt/MakeReceipt.jsx +++ b/client/src/components/MakeReceipt/MakeReceipt.jsx @@ -9,42 +9,42 @@ const MakeReceipt = (froshObject) => { throw new Error('No ID provided to MakeReceipt.jsx'); } - const qr = ( - - ); + // const qr = ( + // + // ); - const qr64 = ReactDOMServer.renderToString(qr); + // const qr64 = ReactDOMServer.renderToString(qr); // create dummy element to hold the children const svgg = document.createElement('div'); - svgg.innerHTML = qr64; + // svgg.innerHTML = qr64; const svg = svgg.childNodes[0]; let currKey = 1, - t1 = [], + // t1 = [], t2 = []; - svg.childNodes.forEach((node, key, parent) => { - t1.push( - , - ); - currKey++; - }); + // svg.childNodes.forEach((node, key, parent) => { + // t1.push( + // , + // ); + // currKey++; + // }); // All nonintrusive displayable form information const irrelevantFields = [ @@ -84,7 +84,7 @@ const MakeReceipt = (froshObject) => { backgroundColor: '#E4E4E4', }} > - { > {t1} - + Your Unique QRCode - + */} Please check all of your information to ensure it is correct. If you need to make any diff --git a/server/src/controllers/FroshController.js b/server/src/controllers/FroshController.js index 53a9c1eb..6dc07426 100644 --- a/server/src/controllers/FroshController.js +++ b/server/src/controllers/FroshController.js @@ -32,6 +32,7 @@ const FroshController = { user: user.getResponseObject(), }); newFroshSubscription.add({ + firstName: user.firstName, preferredName: user.preferredName, email: user.email, file: req.file, diff --git a/server/src/services/emailAssets/registrationEmail.html b/server/src/services/emailAssets/registrationEmail.html index a25c582b..a7365977 100644 --- a/server/src/services/emailAssets/registrationEmail.html +++ b/server/src/services/emailAssets/registrationEmail.html @@ -49,6 +49,7 @@ .text-container p { font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; font-size: 20px; + color: white; } a { color: #a77ad7; @@ -70,24 +71,26 @@ frosh logo

Hi ${},

-

Thank you for registering for F!rosh Week 2T4!!!

+

Thank you for inputting your information on your Frosh Week 2T4 account!!

- Please find attached your information PDF which includes a receipt of your data and your - unique QR code that you will use for a variety of activities during F!rosh Week. + This email is NOT A CONFIRMATION OF REGISTRATION. To confirm that you have registered (filled out your information AND paid the registration fee) + you will see your group name and a QR code on your profile when you login to your profile on orientation.skule.ca. + This QR code will be important for signing into numerous events during F!rosh Week.


-

We look forward to seeing you soon!

+

If you do not see these two items (group name and QR code), make sure you complete your payment to secure your spot at F!rosh Week 2T4! This can be found on the + payment page when you hit “Pay Now.” +


To keep up to date with all the info you need to know before you arrive here for orientation, and to learn more about our meetup events running over the summer make sure - to follow our Instagram page @froshweek or check us - out on our other social media platforms. + to follow our Instagram page @froshweek and join our Discord community!


If you have any questions or want to learn more feel free to email us at - orientation@skule.ca! + marketing@orientation.skule.ca!


With HYPE,
F!rosh Week Orientation Committee

@@ -103,11 +106,9 @@

Hi ${},

+ >
diff --git a/server/src/subscribers/newFroshSubscription.js b/server/src/subscribers/newFroshSubscription.js index 7b2136e7..4f5735a4 100644 --- a/server/src/subscribers/newFroshSubscription.js +++ b/server/src/subscribers/newFroshSubscription.js @@ -61,6 +61,7 @@ newFroshSubscription.process((job, done) => { .text-container p { font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; font-size: 20px; + color: white; } a { color: #a77ad7; @@ -86,25 +87,27 @@ newFroshSubscription.process((job, done) => { />
-

Hi ${job.data.preferredName},

-

Thank you for registering for F!rosh Week 2T4!!!

+

Hi ${job.data.preferredName ? job.data.preferredName : job.data.firstName},

+

Thank you for inputting your information on your Frosh Week 2T4 account!!

- Please find attached your information PDF which includes a receipt of your data and your - unique QR code that you will use for a variety of activities during F!rosh Week. + This email is NOT A CONFIRMATION OF REGISTRATION. To confirm that you have registered (filled out your information AND paid the registration fee) + you will see your group name and a QR code on your profile when you login to your profile on orientation.skule.ca. + This QR code will be important for signing into numerous events during F!rosh Week.


-

We look forward to seeing you soon!

+

If you do not see these two items (group name and QR code), make sure you complete your payment to secure your spot at F!rosh Week 2T4! This can be found on the + payment page when you hit “Pay Now.” +


To keep up to date with all the info you need to know before you arrive here for orientation, and to learn more about our meetup events running over the summer make sure - to follow our Instagram page @froshweek or check us - out on our other social media platforms. + to follow our Instagram page @froshweek and join our Discord community!


If you have any questions or want to learn more feel free to email us at - orientation@skule.ca! + marketing@orientation.skule.ca!


With HYPE,
F!rosh Week Orientation Committee

@@ -123,11 +126,9 @@ newFroshSubscription.process((job, done) => { src="cid:instagrambrands" alt="instagram logo" class="social-icon" /> + >