Skip to content

Commit

Permalink
Merge branch 'dev' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
@gaurikam2003
gaurikam2003 committed Jul 31, 2024
2 parents ff3ab3d + 76802be commit 68db87a
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 54 deletions.
62 changes: 31 additions & 31 deletions client/src/components/MakeReceipt/MakeReceipt.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,42 @@ const MakeReceipt = (froshObject) => {
throw new Error('No ID provided to MakeReceipt.jsx');
}

const qr = (
<QRNormal
value={froshObject.id}
type="round"
opacity={100}
posType="round"
otherColor="#320846"
posColor="#28093A"
backgroundColor="white"
/>
);
// const qr = (
// <QRNormal
// value={froshObject.id}
// type="round"
// opacity={100}
// posType="round"
// otherColor="#320846"
// posColor="#28093A"
// backgroundColor="white"
// />
// );

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(
<Circle
key={currKey}
cx={Number.parseFloat(node.getAttribute('cx')) * 10}
cy={Number.parseFloat(node.getAttribute('cy')) * 10}
r={Number.parseFloat(node.getAttribute('r')) * 10}
fill={node.getAttribute('fill')}
stroke={node.getAttribute('stroke')}
strokeWidth={Number.parseFloat(node.getAttribute('stroke-width')) * 10}
/>,
);
currKey++;
});
// svg.childNodes.forEach((node, key, parent) => {
// t1.push(
// <Circle
// key={currKey}
// cx={Number.parseFloat(node.getAttribute('cx')) * 10}
// cy={Number.parseFloat(node.getAttribute('cy')) * 10}
// r={Number.parseFloat(node.getAttribute('r')) * 10}
// fill={node.getAttribute('fill')}
// stroke={node.getAttribute('stroke')}
// strokeWidth={Number.parseFloat(node.getAttribute('stroke-width')) * 10}
// />,
// );
// currKey++;
// });

// All nonintrusive displayable form information
const irrelevantFields = [
Expand Down Expand Up @@ -84,7 +84,7 @@ const MakeReceipt = (froshObject) => {
backgroundColor: '#E4E4E4',
}}
>
<View
{/* <View
style={{
display: 'flex',
alignItems: 'center',
Expand All @@ -93,11 +93,11 @@ const MakeReceipt = (froshObject) => {
>
<Svg fill="white" style={{ width: '250px', padding: '10px 0 0 0' }}>
{t1}
</Svg>
</Svg>
<Text style={{ fontSize: 16, padding: '10px 0 0 0' }} key={currKey++}>
Your Unique QRCode
</Text>
</View>
</View> */}
<View style={{ padding: '0 10px' }}>
<Text style={{ fontSize: 16, padding: '20px 0' }} key={currKey++}>
Please check all of your information to ensure it is correct. If you need to make any
Expand Down
1 change: 1 addition & 0 deletions server/src/controllers/FroshController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const FroshController = {
user: user.getResponseObject(),
});
newFroshSubscription.add({
firstName: user.firstName,
preferredName: user.preferredName,
email: user.email,
file: req.file,
Expand Down
23 changes: 12 additions & 11 deletions server/src/services/emailAssets/registrationEmail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -70,24 +71,26 @@
<img class="frosh-logo-main" src="./frosh-main-logo-outline.png" alt="frosh logo" />
<div class="text-container">
<h1>Hi ${},</h1>
<p><b>Thank you for registering for F!rosh Week 2T4!!!</b></p>
<p><b>Thank you for inputting your information on your Frosh Week 2T4 account!!</b></p>
<p>
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 <b>NOT A CONFIRMATION OF REGISTRATION</b>. To confirm that you have registered (filled out your information AND paid the registration fee)
you will see your <b>group name and a QR code on your profile</b> when you login to your profile on <a href="http://orientation.skule.ca">orientation.skule.ca</a>.
This QR code will be important for signing into numerous events during F!rosh Week.
</p>
<br />
<p>We look forward to seeing you soon!</p>
<p>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.”
</p>
<br />
<p>
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 <a href="https://bit.ly/froshig">@froshweek</a> or check us
out on our other social media platforms.
to follow our Instagram page <a href="https://bit.ly/froshig">@froshweek</a> and <a href="https://discord.gg/RQrPQMYrHw">join our Discord community</a>!
</p>
<br />
<p>
If you have any questions or want to learn more feel free to email us at
<a href="mailto:orientation@skule.ca">orientation@skule.ca!</a>
<a href="mailto:marketing@orientation.skule.ca">marketing@orientation.skule.ca!</a>
</p>
<br />
<p>With HYPE, <br />F!rosh Week Orientation Committee</p>
Expand All @@ -103,11 +106,9 @@ <h1>Hi ${},</h1>
<div class="socials-container">
<a href="https://bit.ly/froshig" class="social-link"
><img src="./instagram-brands.png" alt="instagram logo" class="social-icon" /></a
><a href="https://discord.com/invite/6D9bBkU4ka" class="social-link"
><a href="https://discord.gg/RQrPQMYrHw" class="social-link"
><img src="./discord-brands.png" alt="discord logo" class="social-icon" /></a
><a href="https://chat.whatsapp.com/L5ZKvpJIOD0JtiJDU9hj1U" class="social-link"
><img src="./whatsapp.png" alt="whatsapp logo" class="social-icon"
/></a>
>
</div>
<img class="frosh-logo" src="./frosh-hard-hat-white.png" alt="F!rosh Week Hardhat Logo" />
</footer>
Expand Down
25 changes: 13 additions & 12 deletions server/src/subscribers/newFroshSubscription.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -86,25 +87,27 @@ newFroshSubscription.process((job, done) => {
/>
<br />
<div class="text-container">
<h1>Hi ${job.data.preferredName},</h1>
<p><b>Thank you for registering for F!rosh Week 2T4!!!</b></p>
<h1>Hi ${job.data.preferredName ? job.data.preferredName : job.data.firstName},</h1>
<p><b>Thank you for inputting your information on your Frosh Week 2T4 account!!</b></p>
<p>
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 <b>NOT A CONFIRMATION OF REGISTRATION</b>. To confirm that you have registered (filled out your information AND paid the registration fee)
you will see your <b>group name and a QR code on your profile</b> when you login to your profile on <a href="http://orientation.skule.ca">orientation.skule.ca</a>.
This QR code will be important for signing into numerous events during F!rosh Week.
</p>
<br />
<p>We look forward to seeing you soon!</p>
<p>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.”
</p>
<br />
<p>
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 <a href="https://bit.ly/froshig">@froshweek</a> or check us
out on our other social media platforms.
to follow our Instagram page <a href="https://bit.ly/froshig">@froshweek</a> and <a href="https://discord.gg/RQrPQMYrHw">join our Discord community</a>!
</p>
<br />
<p>
If you have any questions or want to learn more feel free to email us at
<a href="mailto:orientation@skule.ca">orientation@skule.ca!</a>
<a href="mailto:marketing@orientation.skule.ca">marketing@orientation.skule.ca!</a>
</p>
<br />
<p>With HYPE, <br />F!rosh Week Orientation Committee</p>
Expand All @@ -123,11 +126,9 @@ newFroshSubscription.process((job, done) => {
src="cid:instagrambrands"
alt="instagram logo"
class="social-icon" /></a
><a href="https://discord.com/invite/6D9bBkU4ka" class="social-link"
><a href="https://discord.gg/RQrPQMYrHw" class="social-link"
><img src="cid:discordbrands" alt="discord logo" class="social-icon" /></a
><a href="https://chat.whatsapp.com/L5ZKvpJIOD0JtiJDU9hj1U" class="social-link"
><img src="cid:whatsapp" alt="whatsapp logo" class="social-icon"
/></a>
>
</div>
<img
class="frosh-logo"
Expand Down

0 comments on commit 68db87a

Please sign in to comment.