Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed front-page #52

Merged
merged 1 commit into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EmailTemplates/AnnouncementEmail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ export const getAnnouncementEmailTemplate = (emailBody: string) => {
return `
<p>New announcement from the Data Science club at Georgia Tech!<p>
<div style="background: #eee; padding: 10px; border-radius: 10px;">${emailBody}</div>
<p>You are receiving this email because you selected OK after asked for DSGT email communication consent. If you would like to stop receiving these emails, reach out to John Ramberger at [email protected] or Vicente Miranda at [email protected].</p>
<p>You are receiving this email because you selected OK after asked for DSGT email communication consent. If you would like to stop receiving these emails, reach out to John Ramberger at [email protected], Vicente Miranda at [email protected] or Lavan Vivek at [email protected]</p>
`;
};
4 changes: 2 additions & 2 deletions client/src/Pages/Login/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const Login: FC<LoginProps> = () => {
<form onSubmit={handleSubmit}>
<FlexColumn width="100%">
{/* <div className={styles.Alert}>
Accepting new members for the Fall 2023 semester! After paying
Accepting new members for the Fall 2024 semester! After paying
the dues, your account will automatically be activated.
Make sure to use the email associated with your previous account
on Stripe. Click{" "}
Expand All @@ -62,7 +62,7 @@ const Login: FC<LoginProps> = () => {
to pay dues. For help, please email {" "}
<a
className={styles.LinkText}
href="mailto:vmiranda6@gatech.edu">vmiranda6@gatech.edu
href="mailto:lvivekan3@gatech.edu">lvivekan3@gatech.edu
</a>.
Welcome to the DSGT Family 😄
</div> */}
Expand Down
42 changes: 22 additions & 20 deletions client/src/Pages/Register/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
registerUser,
result_billingDetails,
result_register,
billingDetails
billingDetails,
} from "../../API/Register";
import ErrorText from "../../components/ErrorText/ErrorText";
import InputField from "../../components/InputField/InputField";
Expand Down Expand Up @@ -67,12 +67,12 @@ const Register: FC<RegisterProps> = () => {
setScreen(nextPage);
}
)
.catch((err) => {
setError(err.message);
})
.finally(() => {
setLoading(false);
});
.catch((err) => {
setError(err.message);
})
.finally(() => {
setLoading(false);
});
};

//--------------- Second Form (Personal/Academic info) ---------------
Expand Down Expand Up @@ -2412,19 +2412,21 @@ const Register: FC<RegisterProps> = () => {
</h2>
<div className={styles.Divider}></div>
<p className={styles.Mini}>
Accepting new members for the Fall 2023 semester! After paying
the dues, your account will automatically be activated.
Make sure to use the email associated with your previous account
on Stripe. Click{" "}
<a className={styles.LinkText} href="/register">
here
</a>{" "}
to pay dues. For help, please email {" "}
<a
className={styles.LinkText}
href="mailto:[email protected]">[email protected]
</a>.
Welcome to the DSGT Family!
Accepting new members for the Fall 2024 semester! After paying
the dues, your account will automatically be activated. Make
sure to use the email associated with your previous account on
Stripe. Click{" "}
<a className={styles.LinkText} href="/register">
here
</a>{" "}
to pay dues. For help, please email{" "}
<a
className={styles.LinkText}
href="mailto:[email protected]"
>
[email protected]
</a>
. Welcome to the DSGT Family!
</p>
<a
className={styles.Link}
Expand Down
15 changes: 14 additions & 1 deletion data/seeds/role_updates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,24 @@ export async function seed(knex: Knex): Promise<void> {
// await knex("user").del();
// await knex("announcement").del();

await knex("billing_details").insert({ email: "[email protected]", payment_amount: 1500 });
await knex("billing_details").insert({
email: "[email protected]",
payment_amount: 1500,
});
if (await checkUserEmail("[email protected]")) {
await knex("user")
.update({ role: "developer" })
.where({ email: "[email protected]" });
}

await knex("billing_details").insert({
email: "[email protected]",
payment_amount: 1500,
});
if (await checkUserEmail("[email protected]")) {
await knex("user")
.update({ role: "developer" })
.where({ email: "[email protected]" });
}
}
}
Loading