From 5572567b6ff74361f8a64fe203e48f31a6445074 Mon Sep 17 00:00:00 2001 From: skandrigi Date: Wed, 6 Nov 2024 14:55:24 -0600 Subject: [PATCH 1/8] emails were double sending previously, make small change to resolve this test previous change From f9bc9add55799fe330329009746fea8124b9cc41 Mon Sep 17 00:00:00 2001 From: skandrigi Date: Sat, 23 Nov 2024 23:46:17 -0600 Subject: [PATCH 2/8] fix templates using wrong variable names --- hiss/templates/application/emails/approved.html | 4 ++-- hiss/templates/application/emails/rejected.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hiss/templates/application/emails/approved.html b/hiss/templates/application/emails/approved.html index 8da1eaec..65dd468a 100644 --- a/hiss/templates/application/emails/approved.html +++ b/hiss/templates/application/emails/approved.html @@ -45,7 +45,7 @@

margin-bottom: 20px; " > - You have been accepted to {{event_name}} {{event_year}}! We were impressed by your application and we’re excited to see you + You have been accepted to {{EVENT_NAME}} {{EVENT_YEAR}}! We were impressed by your application and we’re excited to see you September 28-29, 2024.

@@ -122,7 +122,7 @@

- The {{ organizer_name }} Team + The {{ ORGANIZER_NAME }} Team diff --git a/hiss/templates/application/emails/rejected.html b/hiss/templates/application/emails/rejected.html index 3911f45c..600b255c 100644 --- a/hiss/templates/application/emails/rejected.html +++ b/hiss/templates/application/emails/rejected.html @@ -22,7 +22,7 @@

Dear {{ first_n font-weight: normal; color: #777777; margin-bottom: 20px;"> - Thank you so much for applying to {{ event_name }} {{ event_year }}. We really appreciate the time you took to share your + Thank you so much for applying to {{ EVENT_NAME }} {{ EVENT_YEAR }}. We really appreciate the time you took to share your interests and skills with us. Unfortunately, due to space limitations of the MSC, we are only able to accept a limited number hackers, and we are unable to grant you an acceptance. If you're still interested in hacking with us, our spring hackathon, TAMUhack, has a bigger capacity and more awesome prizes to win! We hope to see you there!

@@ -64,7 +64,7 @@

Dear {{ first_n - The {{ organizer_name }} Team + The {{ ORGANIZER_NAME }} Team From 69eb78c4ba9f76c812eba41139bb4059158a90f0 Mon Sep 17 00:00:00 2001 From: skandrigi Date: Sat, 23 Nov 2024 23:54:52 -0600 Subject: [PATCH 3/8] resolve small font error --- hiss/static/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hiss/static/style.css b/hiss/static/style.css index fe8b3a6c..80edb3bc 100644 --- a/hiss/static/style.css +++ b/hiss/static/style.css @@ -1,3 +1,5 @@ +@import url('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'); + html, body { overflow-x: hidden; } @@ -725,8 +727,6 @@ button { color: white; } -@import url('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'); - .errorlist > li { color: #721c24; font-size: 14px; From 69c5cbb60fcb98eb39ab26f81d3342db65f3fd5d Mon Sep 17 00:00:00 2001 From: skandrigi Date: Sun, 24 Nov 2024 00:11:51 -0600 Subject: [PATCH 4/8] fix more template variable errors --- hiss/templates/400.html | 2 +- hiss/templates/403.html | 2 +- hiss/templates/404.html | 2 +- hiss/templates/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hiss/templates/400.html b/hiss/templates/400.html index 11c530e9..0f9eda64 100644 --- a/hiss/templates/400.html +++ b/hiss/templates/400.html @@ -6,7 +6,7 @@

400

Bad Request

Whoops! The request you made isn't valid.

-

If you think this is a mistake, email us at {{ organizer_email }}

+

If you think this is a mistake, email us at {{ ORGANIZER_EMAIL }}

diff --git a/hiss/templates/403.html b/hiss/templates/403.html index fef716ae..ab3ffbef 100644 --- a/hiss/templates/403.html +++ b/hiss/templates/403.html @@ -6,7 +6,7 @@

403

Page Forbidden

Whoops! It looks like you do not have access to this page.

-

If you think this is a mistake, email us at {{ organizer_email }}

+

If you think this is a mistake, email us at {{ ORGANIZER_EMAIL }}

diff --git a/hiss/templates/404.html b/hiss/templates/404.html index 34d929cd..e45a4b48 100644 --- a/hiss/templates/404.html +++ b/hiss/templates/404.html @@ -6,7 +6,7 @@

404

Page Not Found

Whoops! It looks like the page you are looking for doesn't exist.

-

If you think this is a mistake, email us at {{ organizer_email }}

+

If you think this is a mistake, email us at {{ ORGANIZER_EMAIL }}

diff --git a/hiss/templates/500.html b/hiss/templates/500.html index 98d74379..56f90f39 100644 --- a/hiss/templates/500.html +++ b/hiss/templates/500.html @@ -6,7 +6,7 @@

500

Internal Server Error

Whoops! There's an issue on our end. We're working to fix it!

-

If you think this is a mistake, email us at {{ organizer_email }}

+

If you think this is a mistake, email us at {{ ORGANIZER_EMAIL }}

From c25061e346181712d1f30ac74927ecec8dd90b44 Mon Sep 17 00:00:00 2001 From: NitroGuy10 Date: Mon, 25 Nov 2024 11:46:51 -0600 Subject: [PATCH 5/8] Templatize event date on emails --- hiss/application/admin.py | 2 ++ hiss/application/emails.py | 1 + hiss/hiss/settings/customization.py | 1 + hiss/templates/application/emails/approved.html | 4 ++-- hiss/templates/application/emails/confirmed-waitlist.html | 2 +- hiss/templates/application/emails/confirmed.html | 3 ++- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hiss/application/admin.py b/hiss/application/admin.py index ebca4f0a..45ef2bd8 100644 --- a/hiss/application/admin.py +++ b/hiss/application/admin.py @@ -59,6 +59,7 @@ def build_approval_email( "event_year": settings.EVENT_YEAR, "confirmation_deadline": confirmation_deadline, "organizer_email": settings.ORGANIZER_EMAIL, + "event_date_text": settings.EVENT_DATE_TEXT, } html_message = render_to_string("application/emails/approved.html", context) message = strip_tags(html_message) @@ -78,6 +79,7 @@ def build_rejection_email(application: Application) -> Tuple[str, str, None, Lis "organizer_name": settings.ORGANIZER_NAME, "event_year": settings.EVENT_YEAR, "organizer_email": settings.ORGANIZER_EMAIL, + "event_date_text": settings.EVENT_DATE_TEXT, } html_message = render_to_string("application/emails/rejected.html", context) message = strip_tags(html_message) diff --git a/hiss/application/emails.py b/hiss/application/emails.py index 92ddf1df..8ab7e2d9 100644 --- a/hiss/application/emails.py +++ b/hiss/application/emails.py @@ -78,6 +78,7 @@ def send_confirmation_email(app: Application) -> None: "event_year": settings.EVENT_YEAR, "organizer_email": settings.ORGANIZER_EMAIL, "apple_wallet_url": get_apple_wallet_pass_url(app.user.email), + "event_date_text": settings.EVENT_DATE_TEXT, } html_msg = render_to_string(email_template, context) plain_msg = html.strip_tags(html_msg) diff --git a/hiss/hiss/settings/customization.py b/hiss/hiss/settings/customization.py index 188bebf3..5b4f549d 100644 --- a/hiss/hiss/settings/customization.py +++ b/hiss/hiss/settings/customization.py @@ -7,6 +7,7 @@ ORGANIZER_EMAIL = "hello@tamuhack.com" EVENT_START_DATETIME = timezone.datetime(2024, 9, 28, hour=9, minute=0, second=0) EVENT_END_DATETIME = timezone.datetime(2024, 9, 29, hour=12, minute=0, second=0) +EVENT_DATE_TEXT = "September 28-29, 2024" MAX_MEMBERS_PER_TEAM = 4 APPLE_WALLET_S3_BUCKET_URL = "https://hh24-apple-wallet-passes.s3.amazonaws.com" diff --git a/hiss/templates/application/emails/approved.html b/hiss/templates/application/emails/approved.html index 65dd468a..9486a97b 100644 --- a/hiss/templates/application/emails/approved.html +++ b/hiss/templates/application/emails/approved.html @@ -45,9 +45,9 @@

margin-bottom: 20px; " > - You have been accepted to {{EVENT_NAME}} {{EVENT_YEAR}}! We were impressed by your application and we’re excited to see you + You have been accepted to {{EVENT_NAME}} {{EVENT_YEAR}}! We were impressed by your application and we're excited to see you September 28-29, 2024. + >{{ event_date_text }}.

Howdy, hackers!

-You are waitlisted for HowdyHack 2024 on September 28 - 29. We will have a separate line for students on the waitlist. After 10AM, we will admit people from the waitlist line until the MSC capacity has been reached. Please come early to ensure you have a higher chance of being admitted to the event as it is first come, first serve. +You are waitlisted for HowdyHack 2024 on {{ event_date_text }}. We will have a separate line for students on the waitlist. After 10AM, we will admit people from the waitlist line until the MSC capacity has been reached. Please come early to ensure you have a higher chance of being admitted to the event as it is first come, first serve.

Check-in
diff --git a/hiss/templates/application/emails/confirmed.html b/hiss/templates/application/emails/confirmed.html index b807fc3b..18961f93 100644 --- a/hiss/templates/application/emails/confirmed.html +++ b/hiss/templates/application/emails/confirmed.html @@ -463,6 +463,7 @@

@@ -473,7 +474,7 @@

Howdy, hackers!

-We're so excited to see you at HowdyHack 2024 on September 28 - 29. +We're so excited to see you at HowdyHack 2024 on {{ event_date_text }}.

Check-in
From 21312f9d45dc2af620eefe17a2f6a61270631ccd Mon Sep 17 00:00:00 2001 From: Eric Li Date: Mon, 25 Nov 2024 13:57:17 -0600 Subject: [PATCH 6/8] TAMUhack 2025 setup --- hiss/application/emails.py | 2 +- hiss/hiss/settings/base.py | 2 +- hiss/hiss/settings/customization.py | 10 +++++----- hiss/templates/application/emails/confirmed-hh.html | 2 +- .../application/emails/confirmed-waitlist.html | 2 +- hiss/templates/application/emails/confirmed.html | 4 ++-- hiss/templates/status/status.html | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hiss/application/emails.py b/hiss/application/emails.py index 8ab7e2d9..0e09d788 100644 --- a/hiss/application/emails.py +++ b/hiss/application/emails.py @@ -69,7 +69,7 @@ def send_confirmation_email(app: Application) -> None: :type app: Application :return: None """ - subject = f"HowdyHack Waitlist: Important Day-Of Information" + subject = f"TAMUhack: Important Day-Of Information" email_template = "application/emails/confirmed.html" context = { "first_name": app.first_name, diff --git a/hiss/hiss/settings/base.py b/hiss/hiss/settings/base.py index 61cc89fe..cec92994 100644 --- a/hiss/hiss/settings/base.py +++ b/hiss/hiss/settings/base.py @@ -116,7 +116,7 @@ AWS_REGION = "us-east-2" AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID") AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY") -AWS_S3_BUCKET_NAME = "2024-hh-resumes" +AWS_S3_BUCKET_NAME = "2025-th-resumes" AWS_S3_KEY_PREFIX = "prod" STATIC_URL = "/" + BASE_PATHNAME + "static/" diff --git a/hiss/hiss/settings/customization.py b/hiss/hiss/settings/customization.py index 5b4f549d..13da5c92 100644 --- a/hiss/hiss/settings/customization.py +++ b/hiss/hiss/settings/customization.py @@ -1,13 +1,13 @@ from django.utils import timezone MAX_YEARS_ADMISSION = 6 -EVENT_NAME = "HowdyHack" -EVENT_YEAR = "2024" +EVENT_NAME = "TAMUhack" +EVENT_YEAR = "2025" ORGANIZER_NAME = "TAMUhack" ORGANIZER_EMAIL = "hello@tamuhack.com" -EVENT_START_DATETIME = timezone.datetime(2024, 9, 28, hour=9, minute=0, second=0) -EVENT_END_DATETIME = timezone.datetime(2024, 9, 29, hour=12, minute=0, second=0) -EVENT_DATE_TEXT = "September 28-29, 2024" +EVENT_START_DATETIME = timezone.datetime(2025, 1, 25, hour=9, minute=0, second=0) +EVENT_END_DATETIME = timezone.datetime(2025, 1, 26, hour=12, minute=0, second=0) +EVENT_DATE_TEXT = "January 25-26, 2025" MAX_MEMBERS_PER_TEAM = 4 APPLE_WALLET_S3_BUCKET_URL = "https://hh24-apple-wallet-passes.s3.amazonaws.com" diff --git a/hiss/templates/application/emails/confirmed-hh.html b/hiss/templates/application/emails/confirmed-hh.html index 8ab56a1e..bacb2a75 100644 --- a/hiss/templates/application/emails/confirmed-hh.html +++ b/hiss/templates/application/emails/confirmed-hh.html @@ -515,7 +515,7 @@

Special Accommodations
-If you require any special accommodations during HowdyHack, please email us at hello@tamuhack.com and we’d be happy to work with you.
+If you require any special accommodations during {{event_name}}, please email us at hello@tamuhack.com and we’d be happy to work with you.


We can't wait to meet all you! Get ready for a fun-filled weekend!
diff --git a/hiss/templates/application/emails/confirmed-waitlist.html b/hiss/templates/application/emails/confirmed-waitlist.html index 85b0b180..9c3a8fd2 100644 --- a/hiss/templates/application/emails/confirmed-waitlist.html +++ b/hiss/templates/application/emails/confirmed-waitlist.html @@ -473,7 +473,7 @@

Howdy, hackers!

-You are waitlisted for HowdyHack 2024 on {{ event_date_text }}. We will have a separate line for students on the waitlist. After 10AM, we will admit people from the waitlist line until the MSC capacity has been reached. Please come early to ensure you have a higher chance of being admitted to the event as it is first come, first serve. +You are waitlisted for {{event_name}} on {{ event_date_text }}. We will have a separate line for students on the waitlist. After 10AM, we will admit people from the waitlist line until the MSC capacity has been reached. Please come early to ensure you have a higher chance of being admitted to the event as it is first come, first serve.

Check-in
diff --git a/hiss/templates/application/emails/confirmed.html b/hiss/templates/application/emails/confirmed.html index 18961f93..80cfb7e8 100644 --- a/hiss/templates/application/emails/confirmed.html +++ b/hiss/templates/application/emails/confirmed.html @@ -436,7 +436,7 @@ -

Get ready for HowdyHack 2024!

+

Get ready for TAMUhack 2025!

Important Reminders

@@ -474,7 +474,7 @@

Howdy, hackers!

-We're so excited to see you at HowdyHack 2024 on {{ event_date_text }}. +We're so excited to see you at TAMUhack 2025 on {{ event_date_text }}.

Check-in
diff --git a/hiss/templates/status/status.html b/hiss/templates/status/status.html index 412afbfb..a5c135d6 100644 --- a/hiss/templates/status/status.html +++ b/hiss/templates/status/status.html @@ -107,7 +107,7 @@
ACCEPTED

- Please RSVP below by September 27th, 2024, at 11:59PM or you risk losing your spot. + Please RSVP below by January 24th, 2025, at 11:59PM or you risk losing your spot.