Skip to content

Commit

Permalink
Merge pull request #386 from tamuhack-org/cameronbrill/th21-final-upd…
Browse files Browse the repository at this point in the history 
…ates

th21 final updates
  • Loading branch information
@cameronbrill
cameronbrill authored Jan 24, 2021
2 parents 7f9c113 + 3bc04a3 commit e7f2b68
Show file tree
Hide file tree
Showing 5 changed files with 275 additions and 281 deletions.
4 changes: 3 additions & 1 deletion hiss/application/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ def approve(_modeladmin, _request: HttpRequest, queryset: QuerySet) -> None:
) + timezone.timedelta(application.wave.num_days_to_rsvp)
application.status = STATUS_ADMITTED
application.confirmation_deadline = deadline
email_tuples.append(build_approval_email(application, deadline))
approval_email = build_approval_email(application, deadline)
print(f"approval email built for {approval_email[-1:]}")
email_tuples.append(approval_email)
application.save()
send_mass_html_mail(email_tuples)

Expand Down
1 change: 1 addition & 0 deletions hiss/application/emails.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ def send_confirmation_email(app: Application) -> None:
qr_stream = BytesIO()
qr_code.png(qr_stream, scale=5)
email.attach("code.png", qr_stream.getvalue(), "text/png")
print(f"sending confirmation email to {app.user.email}")
email.send()
4 changes: 2 additions & 2 deletions hiss/hiss/settings/customization.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
EVENT_NAME = "TAMUhack"
EVENT_YEAR = "2021"
ORGANIZER_EMAIL = "[email protected]"
EVENT_START_DATETIME = timezone.datetime(2020, 1, 25, hour=9, minute=0, second=0)
EVENT_END_DATETIME = timezone.datetime(2020, 1, 26, hour=12, minute=0, second=0)
EVENT_START_DATETIME = timezone.datetime(2020, 1, 30, hour=9, minute=0, second=0)
EVENT_END_DATETIME = timezone.datetime(2020, 1, 31, hour=12, minute=0, second=0)

MAX_MEMBERS_PER_TEAM = 4
183 changes: 96 additions & 87 deletions hiss/templates/application/emails/approved.html
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,103 @@
<html>
<div style="max-width:800px; background-color: #F9ECEE; z-index: -1; position: absolute; top: 0; left: 0; padding: 20px">
<div
style="
max-width: 800px;
background-color: #f9ecee;
z-index: -1;
position: absolute;
top: 0;
left: 0;
padding: 20px;
"
>
<div
style="
font-family: Questrial, sans-serif;
background: #fff;
box-shadow: 0px 10px 10px rgba(0, 0, 0, 0.1);
border-radius: 3px;
padding: 50px !important;
max-width: 500px;
display: block;
margin: 20px auto;
"
>
<h2 style="margin-bottom: 20px; font-size: 16px; color: #777777">
Congratulations, {{ first_name }}!
</h2>

<div style="font-family: Questrial, sans-serif;
background: #fff;
box-shadow: 0px 10px 10px rgba(0, 0, 0, 0.1);
border-radius: 3px;
padding: 50px!important;
max-width: 500px;
display: block;
margin: 20px auto;">
<p
style="
line-height: 20px;
font-weight: normal;
color: #777777;
margin-bottom: 20px;
"
>
You have been accepted to {{ event_name }}! We were very impressed by
your application and have handpicked you to attend.
</p>
<p
style="
line-height: 20px;
-webkit-font-smoothing: antialiased;
font-weight: normal;
color: #777777;
margin-bottom: 20px;
"
>
We hope to see you attend virtually on
<span style="color: #ed768b; font-weight: 700"
>January 30 - 31, 2021.</span
>
</p>
<p
style="
line-height: 20px;
-webkit-font-smoothing: antialiased;
font-weight: normal;
color: #777777;
margin-bottom: 20px;
"
>
<span style="color: #ed768b; font-weight: 700"
>We'll be sending out an email soon with the full schedule of events
and more details!</span
>
</p>

<h2 style="margin-bottom: 20px; font-size: 16px; color: #777777">Congratulations, {{ first_name }}! </h2>
<p
style="
line-height: 20px;
color: #777777;
padding-bottom: 20px;
margin-bottom: 20px;
"
>
In the meantime, feel free to email
<a href="mailto:{{ organizer_email }}" style="color: #00add8"
>{{ organizer_email }}</a
>
if you have any questions.
</p>

<p style="line-height: 20px;
font-weight: normal;
color: #777777;
margin-bottom: 20px;">
You have been accepted to {{ event_name }}! We were impressed by your application and have handpicked you to
attend.
</p>
<p style="line-height: 20px;
-webkit-font-smoothing: antialiased;
font-weight: normal;
color: #777777;
margin-bottom: 20px;">
Please <span style="color: #ED768B; font-weight: 700">RSVP at the link below by {{ confirmation_deadline }}</span>
to confirm your attendance.
</p>
<h3
style="
margin-bottom: 5px;
font-size: 16px;
line-height: 30px;
font-weight: normal;
color: #777777;
padding-top: 20px;
margin-top: 20px;
"
>
Thanks!
</h3>

<p style="line-height: 20px;
font-weight: 700;
color: #777777;
border-bottom: 1px solid #DEDEDE; padding-bottom: 20px; margin-bottom: 20px;">
Please read the following important information before filling out the RSVP form.
</p>

<div style="margin-bottom: 20px; color: #777777">
<h5 style="text-align: center; font-size: 16px; margin-bottom: 5px; margin-top: 0;">
Event Details:
</h5>
<p style="line-height: 20px; text-align: center; margin-top: 0; margin-bottom: 0px;">
January 25th &#8211; 26th, 2020
</p>
<p style="line-height: 20px; text-align: center; margin-top: 0; margin-bottom: 0px;">
Memorial Student Center, Bethancourt Ballroom
</p>
<p style="line-height: 20px; text-align: center; margin-top: 0; margin-bottom: 0px;">
Texas A&amp;M University, College Station
</p>
</div>

<p style="line-height: 20px; color: #777777; margin-bottom: 15px;">
Check out our website for the full schedule of events!
</p>

<p style="line-height: 20px; color: #777777; margin-bottom: 20px;">
We will be sending another email closer to the hackathon with more details on what to bring, where to park,
and anything else you might want to know.
</p>

<p style="line-height: 20px; color: #777777; border-bottom: 1px solid #DEDEDE; padding-bottom: 20px; margin-bottom: 20px;">
In the meantime, feel free to email <a href="mailto:{{ organizer_email }}" style="color: #00ADD8">{{ organizer_email }}</a>
if you have any questions.
</p>

<h4 style="color:#ED768B; margin-bottom: 10px;">Required: Sign into your account and RSVP to let us know whether
you will be attending {{ event_name }}.</h4>
<a href="https://register.tamuhack.com/" target="_blank"
style="display: inline-block; background-color: #ED768B; color: white; font-weight: 700; padding: 15px 20px; text-decoration: none; border-radius: 5px;">LOG
IN</a>

<p style="line-height: 20px; color: #777777; margin-top: 20px; margin-bottom: 10px;">Optional: If you are also
interested in mentoring other hackers at {{ event_name }}, please fill this form out too!</p>
<a href="https://docs.google.com/forms/d/e/1FAIpQLSeMw-cEI_E5Eqo3pd2ko3ppKVxSNWvkyHPFUCEgZJ4JVsZKmQ/viewform" target="_blank"
style="display: inline-block; background-color: #4E678A; color: white; font-weight: 700; padding: 15px 20px; text-decoration: none; border-radius: 5px;">MENTOR
FORM</a>

<h3 style=" margin-bottom: 5px;
font-size: 16px;
line-height: 30px;
font-weight: normal;
color: #777777;
border-top: 1px solid #DEDEDE; padding-top: 20px; margin-top: 20px;">
Thanks!
</h3>

<strong style="color: #ED768B;
font-size: 16px;">
The {{ event_name }} Team
</strong>
<strong style="color: #ed768b; font-size: 16px">
The {{ event_name }} Team
</strong>
</div>
</div>
</div>
</html>
Loading

0 comments on commit e7f2b68

Please sign in to comment.