diff --git a/goathacks/__init__.py b/goathacks/__init__.py index d11608c..e98a28e 100644 --- a/goathacks/__init__.py +++ b/goathacks/__init__.py @@ -5,6 +5,7 @@ from flask_login import LoginManager from flask_assets import Bundle, Environment from flask_cors import CORS from flask_mail import Mail, email_dispatched +from flask_bootstrap import Bootstrap5 db = SQLAlchemy() @@ -13,6 +14,7 @@ login = LoginManager() environment = Environment() cors = CORS() mail = Mail() +bootstrap = Bootstrap5() def create_app(): app = Flask(__name__) @@ -25,6 +27,7 @@ def create_app(): environment.init_app(app) cors.init_app(app) mail.init_app(app) + bootstrap.init_app(app) scss = Bundle('css/style.scss', filters='scss', output='css/style.css') diff --git a/goathacks/dashboard/forms.py b/goathacks/dashboard/forms.py index ebfad2d..4f39717 100644 --- a/goathacks/dashboard/forms.py +++ b/goathacks/dashboard/forms.py @@ -1,6 +1,6 @@ from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired, FileAllowed -from wtforms import RadioField, TextAreaField +from wtforms import RadioField, TextAreaField, SubmitField from wtforms.validators import DataRequired class ShirtAndAccomForm(FlaskForm): @@ -8,9 +8,12 @@ class ShirtAndAccomForm(FlaskForm): "None"], validators=[DataRequired()]) accomodations = TextAreaField("Special needs and/or Accomodations") + submit = SubmitField("Save") class ResumeForm(FlaskForm): resume = FileField("Resume", validators=[FileRequired(), FileAllowed(['pdf', 'docx', 'doc', 'txt', 'rtf'], "Documents only!")]) + + submit = SubmitField("Submit") diff --git a/goathacks/static/css/style.scss b/goathacks/static/css/style.scss index 590d65f..872912d 100644 --- a/goathacks/static/css/style.scss +++ b/goathacks/static/css/style.scss @@ -4,6 +4,7 @@ $color-section-bg: #974355; $color-accent: #26a69a; @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"); } + html { height: 100%; } diff --git a/goathacks/templates/base.html b/goathacks/templates/base.html index 1442c25..c556c8b 100644 --- a/goathacks/templates/base.html +++ b/goathacks/templates/base.html @@ -1,15 +1,9 @@ {% include 'header.html' %} +{% from 'bootstrap5/utils.html' import render_messages %}
- {% with messages = get_flashed_messages() %} - {% if messages %} - - {% endif %} - {% endwith %} + {{ render_messages() }} + {% block content %} This content block is still being worked on! diff --git a/goathacks/templates/dashboard.html b/goathacks/templates/dashboard.html index 26680c6..ccea485 100644 --- a/goathacks/templates/dashboard.html +++ b/goathacks/templates/dashboard.html @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% from 'bootstrap5/form.html' import render_form %} {% block content %} @@ -16,74 +17,62 @@ } -
-
-
-

Hi {{ current_user.first_name }}!

- {% if current_user.waitlisted %} -

You are waitlisted, if space opens up we will let you know

- {% else %} -

You are fully registered! We look forward to seeing you!

- Let us know if you have any questions by sending them to hack@wpi.edu -
-
- Forgot to upload your resume while registering? No worries, submit it below. +
+
+ +

Hi {{ current_user.first_name }}!


+ +
+ {% if current_user.waitlisted %} +

You're currently waitlisted, keep checking your email to see if space + opens up!

+ {% else %} +

Your registration is confirmed! We're looking forward to seeing you at + GoatHacks!

+ Let us know if you have any questions by sending them to hack@wpi.edu +
+
+
+

Make sure you join the Discord and add your shirt size as well as any + needed accomodations below

+
+
+ +
+ +
+
+
+
+ {{ render_form(form) }} +
+
-
-
Make sure to join the Discord and enter your shirt size below!
-

(Please note that due to COVID-19 constraints, we can't guarantee that all participants will receive Hack@WPI t-shirts this year but we are trying to find a way!)

- Discord -
-
-
- {{ form.csrf_token }} -
-

Optional Info:

-
-

Shirt Size (Currently selected: {{current_user.shirt_size}})

- {% for subfield in form.shirt_size %} - {{subfield}}{{subfield.label}} - {% endfor %} -

Special Needs/Accommodations:

- -
-

- -


-
-
-
+
+
{{ resform.csrf_token }}

If you'd like, add your resume to send to sponsors...

- File - +
-
- -
- {% endif %} -
-
- {% if current_user.is_admin %} -
-
-

Admin Dashboard

 -
- {% endif %} -
-
-
-

Drop Application if you can't make it :(

+ {% endif %} + {% if current_user.is_admin %} +
+ +
+ {% endif %}