Merge branch 'master' into sarah

This commit is contained in:
Sarah Akbar 2020-01-08 12:07:26 -05:00
commit 9bf6b73e5a
6 changed files with 183 additions and 3 deletions

View file

@ -136,8 +136,8 @@ def register():
# Request flow == messed up somehow, restart them
return redirect(url_for('register'))
if 'resume' not in request.files:
# No file?
if 'resume' not in request.files or 'tos' not in request.form:
# No file or no TOS agreement?
return redirect(url_for('register'))
resume = request.files['resume']
@ -446,6 +446,10 @@ def dashboard():
return render_template('dashboard.html', name=session['mymlh']['first_name'], id=session['mymlh']['id'],
admin=is_admin())
@app.route('/tos', methods=['GET'])
def tos():
return render_template('tos.html')
def is_logged_in():
if session is None:

View file

@ -0,0 +1,79 @@
@font-face {font-family: "Krungthep"; src: url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.eot"); src: url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.woff") format("woff"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.svg#Krungthep") format("svg"); }
body {
background-color: #00BEBB;
font-family: "Krungthep";
color: #eee;
}
nav {
background-color: #E7E4C6;
border-color: #E7E4C6;
color: white;
}
hr {
margin-top: 2rem;
margin-bottom: 2rem;
width: 70%;
border-width: 10px;
border-color: #F5665B;
}
h2 {
text-align: center;
}
h3 {
text-align: center;
}
h4 {
text-align: center;
}
h5 {
text-align: center;
}
h6 {
text-align: center;
margin-right: 100px;
margin-left: 100px;
}
.sponsors {
text-align: center;
display: block;
padding: 20px;
}
.sponsors img {
display: inline-block;
margin-right: 40px;
margin-bottom: 40px;
}
.title-sponsors img{
max-height: 90px;
}
/*.gold-sponsors img {
max-height: 40px;
}*/
.silver-sponsors img {
max-height: 25px;
}
/*.bronze-sponsors img {
max-height: 10px;
}*/
/*
#logo-stack {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
*/
a {
color: black;
}

View file

@ -0,0 +1,79 @@
@font-face {font-family: "Krungthep"; src: url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.eot"); src: url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.woff") format("woff"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/736cf5b08b01082a3645e14038868e20.svg#Krungthep") format("svg"); }
body {
background-color: #00BEBB;
font-family: "Krungthep";
color: #eee;
}
nav {
background-color: #E7E4C6;
border-color: #E7E4C6;
color: white;
}
hr {
margin-top: 2rem;
margin-bottom: 2rem;
width: 70%;
border-width: 10px;
border-color: #F5665B;
}
h2 {
text-align: center;
}
h3 {
text-align: center;
}
h4 {
text-align: center;
}
h5 {
text-align: center;
}
h6 {
text-align: center;
margin-right: 100px;
margin-left: 100px;
}
.sponsors {
text-align: center;
display: block;
padding: 20px;
}
.sponsors img {
display: inline-block;
margin-right: 40px;
margin-bottom: 40px;
}
.title-sponsors img{
max-height: 90px;
}
/*.gold-sponsors img {
max-height: 40px;
}*/
.silver-sponsors img {
max-height: 25px;
}
/*.bronze-sponsors img {
max-height: 10px;
}*/
/*
#logo-stack {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
*/
a {
color: black;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -25,6 +25,9 @@
</div>
</div>
<p>By registering & attending, you agree to the following policies:</p>
<p>
<a href="/tos">Hack@WPI's Terms and Conditions</a>
</p>
<p>
<a href="https://github.com/MLH/mlh-policies/blob/master/data-sharing.md">MLH's Data Sharing Notice</a>
</p>
@ -39,7 +42,7 @@
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">MLH's Code of Conduct</a>
</p>
<br>
<input type="checkbox" id="checkboxid" required><label for="checkboxid"><b style="color:black;">Do you agree with these Rules?</b></label>
<input type="checkbox" name="tos" id="checkboxid" required><label for="checkboxid"><b style="color:black;">Do you agree with these Rules?</b></label>
<br><br>
<input name="submit" class="btn btn-lg btn-primary btn-invert" type="submit" value="Submit"/>
</form>

15
templates/tos.html Normal file
View file

@ -0,0 +1,15 @@
{% include 'header.html' %}
<p>
I agree to hold harmless the organizers of HACK@WPI and WPIs Chapter of the Association of Computing Machinery (ACM) from any and all claims, lawsuits, demands, causes of action, liability, loss, damage and/or injury of any kind whatsoever (including without limitation all claims for monetary loss, property damager, equitable relief, personal injury and/or wrongful death), whether brought by an individual or other entity. The indemnification applies to and includes, without limitation, the payment of all penalties, fines, judgments, awards, decrees, attorneys fees, and related costs or expenses, and any reimbursements to ACM for all legal fees, expenses, and costs incurred by it.
</p>
<p>
I also acknowledge the organizers of HACK@WPI will be recording the event using video, photographs, audio recordings, and other media and give them permission to use said media in marketing/promotional materials.
</p>
<style>
p {
margin: 25px 100px;
}
</style>
{% include 'footer.html' %}