Re-add Discord link to participant dashboard

can't believe it took us this long

.gitignore

@@ -1,7 +1,6 @@
 resumes*/
 resumes*.zip
 config_hackWPI.py
-config.py
 admin/*.json
 admin/*.csv
 
@@ -13,6 +12,8 @@ goathacks/config.py
 sqldmp
 .vscode/
 
+.DS_Store
+
 
 ### Bower ###
 bower_components

Makefile

@@ -32,7 +32,7 @@ daemon:
 	@echo "--- STARTING UWSGI DAEMON ---"
 	@echo ""
 	@echo ""	
-	source .venv/bin/activate && flask run
+	source .venv/bin/activate && flask --debug run
 	@echo ""
 	@echo ""
 	@echo "--- STARTING UWSGI DAEMON ---"	

config.py

@@ -0,0 +1,30 @@
+import os
+
+from dotenv import load_dotenv, dotenv_values
+
+basedir = os.path.abspath(os.path.dirname(__file__))
+load_dotenv(os.path.join(basedir, '.env'))
+
+class Config():
+    TESTING = dotenv_values().get("TESTING") or False
+    DEBUG = dotenv_values().get("DEBUG") or False
+
+    SQLALCHEMY_DATABASE_URI = dotenv_values().get("SQLALCHEMY_DATABASE_URI") or "postgresql://localhost/goathacks"
+
+    MAX_BEFORE_WAITLIST = int(dotenv_values().get("MAX_BEFORE_WAITLIST") or 1)
+    MCE_API_KEY = dotenv_values().get("MCE_API_KEY")
+    SECRET_KEY = dotenv_values().get("SECRET_KEY") or "bad-key-change-me"
+
+    UPLOAD_FOLDER = dotenv_values().get("UPLOAD_FOLDER") or "./uploads/"
+
+    DISCORD_LINK = dotenv_values().get("DISCORD_LINK") or None
+
+    # Mail server settings
+    MAIL_SERVER = dotenv_values().get("MAIL_SERVER") or "localhost"
+    MAIL_PORT = dotenv_values().get("MAIL_PORT") or 25
+    MAIL_USE_TLS = dotenv_values().get("MAIL_USE_TLS") or False
+    MAIL_USE_SSL = dotenv_values().get("MAIL_USE_SSL") or False
+    MAIL_USERNAME = dotenv_values().get("MAIL_USERNAME") or "dummy"
+    MAIL_PASSWORD = dotenv_values().get("MAIL_PASSWORD") or "dummy"
+    MAIL_DEFAULT_SENDER = dotenv_values().get("MAIL_DEFAULT_SENDER") or "GoatHacks Team <hack@wpi.edu>"
+    MAIL_SUPPRESS_SEND = dotenv_values().get("MAIL_SUPPRESS_SEND") or TESTING

goathacks/__init__.py

@@ -9,6 +9,8 @@ from flask_bootstrap import Bootstrap5
 from flask_font_awesome import FontAwesome
 from flask_qrcode import QRcode
 
+from config import Config
+
 
 
 db = SQLAlchemy()
@@ -21,10 +23,10 @@ bootstrap = Bootstrap5()
 font_awesome = FontAwesome()
 qrcode = QRcode()
 
-def create_app():
+def create_app(config_class=Config):
     app = Flask(__name__)
 
-    app.config.from_pyfile("config.py")
+    app.config.from_object(config_class)
 
     db.init_app(app)
     migrate.init_app(app, db)
@@ -82,6 +84,10 @@ def create_app():
     def index():
         return render_template("home/index.html")
     
+    @app.route("/index2.html")
+    def index2():
+        return render_template("home/index2.html")
+
     # homepage assets
     @app.route("/assets/<path:path>")
     def assets(path):

goathacks/admin/__init__.py

@@ -9,9 +9,9 @@ bp = Blueprint("admin", __name__, url_prefix="/admin")
 from goathacks import db, mail as app_mail
 from goathacks.admin import events
 
-@bp.route("/")
-@login_required
-def home():
+# Helper function for admin.home and admin.admin_list to render list of users.
+# This function was abstracted to promote code reuse.
+def render_user_list(admin_list):
     if not current_user.is_admin:
         return redirect(url_for("dashboard.home"))
     male_count = 0
@@ -21,7 +21,10 @@ def home():
     waitlist_count = 0
     total_count = 0
     shirt_count = {'XS': 0, 'S': 0, 'M': 0, 'L': 0, 'XL': 0}
-    hackers = db.session.execute(db.select(User)).scalars().all()
+    if(admin_list):
+        hackers = db.session.execute(db.select(User).where(User.is_admin)).scalars().all()
+    else:
+        hackers = db.session.execute(db.select(User).where(User.is_admin == False)).scalars().all()
     schools = {}
     
     for h in hackers:
@@ -55,6 +58,17 @@ def home():
                            female_count=female_count, nb_count=nb_count,
                            check_in_count=check_in_count, schools=schools)
 
+@bp.route("/")
+@login_required
+def home():
+    return render_user_list(False) # list users (not admins)
+
+@bp.route("/admin_list")
+@login_required
+def admin_list():
+    return render_user_list(True) # list users (admins)
+
+
 @bp.route("/mail")
 @login_required
 def mail():

goathacks/admin/events.py

@@ -1,11 +1,11 @@
 import flask
-from flask import Response, render_template, redirect, request, url_for, flash
+from flask import Response, render_template, redirect, request, url_for, flash, current_app
 from flask_login import current_user, login_required
 from goathacks.admin import bp, forms
 from goathacks import db
 from goathacks.models import Event
 
-import io, qrcode
+import io, qrcode, datetime
 import qrcode.image.pure
 
 @bp.route("/events")
@@ -16,7 +16,86 @@ def list_events():
 
     events = Event.query.all()
 
-    return render_template("events/list.html", events=events)
+    form = forms.EventForm()
+
+    return render_template("events/list.html", events=events, form=form)
+
+@bp.route("/event/<int:id>/delete")
+@login_required
+def delete_event(id):
+    if not current_user.is_admin:
+        return {"status": "error", "message": "Unauthorized"}
+    
+    event = Event.query.filter_by(id=id).first()
+
+    if event is None:
+        return {"status": "error", "message": "Invalid event ID"}
+    
+    db.session.delete(event)
+    db.session.commit()
+
+    return {"status": "success"}
+
+@bp.route("/event/<int:id>")
+@login_required
+def event(id):
+    if not current_user.is_admin:
+        return {"status": "error", "message": "Unauthorized"}
+    
+    event = Event.query.filter_by(id=id).first()
+
+    if event is None:
+        return {"status": "error", "message": "Invalid event ID"}
+    
+    return event.create_json()
+
+@bp.route("/event/<int:id>", methods=["POST"])
+@login_required
+def update_create_event(id):
+    if not current_user.is_admin:
+        flash("Unauthorized")
+        return redirect(url_for("dashboard.home"))
+
+    name = request.form.get('name')
+    description = request.form.get('description')
+    location = request.form.get('location')
+    start_day = request.form.get('start_day')
+    start_time = request.form.get('start_time')
+    end_day = request.form.get('end_day')
+    end_time = request.form.get('end_time')
+    start = datetime.datetime.combine(datetime.date.fromisoformat(start_day),
+                              datetime.time.fromisoformat(start_time)) 
+    end = datetime.datetime.combine(datetime.date.fromisoformat(end_day),
+                                  datetime.time.fromisoformat(end_time)) 
+    category = request.form.get("category")
+
+    if id == 0:
+        # new event
+        e = Event(
+                name=name,
+                description=description,
+                location=location,
+                start_time=start,
+                category=category,
+                end_time=end)
+        db.session.add(e)
+        db.session.commit()
+        current_app.logger.info(f"{current_user} is creating a new event: {e.name}")
+    else:
+        e = Event.query.filter_by(id=id).first()
+        if e is None:
+            return {"status": "error", "message": "Invalid event ID"}
+        e.name = name
+        e.description = description
+        e.location = location
+        e.start_time = start
+        e.end_time = end
+        e.category=category
+        db.session.commit()
+        current_app.logger.info(f"{current_user} is updating an existing event: {e.name}")
+
+
+    return redirect(url_for("admin.list_events"))
 
 @bp.route("/events/events.json")
 @login_required

goathacks/admin/forms.py

@@ -1,12 +1,14 @@
 from flask_wtf import FlaskForm
-from wtforms import StringField, DateTimeField, SubmitField, TextAreaField
+from wtforms import StringField, DateField, TimeField, SubmitField, TextAreaField
 from wtforms.validators import DataRequired
 
 class EventForm(FlaskForm):
     name = StringField("Name", validators=[DataRequired()])
     description = TextAreaField("Description")
     location = StringField("Location", validators=[DataRequired()])
-    start_time = DateTimeField("Start Time", validators=[DataRequired()])
-    end_time = DateTimeField("End Time", validators=[DataRequired()])
+    start_day = DateField("Start Day", validators=[DataRequired()])
+    start_time = TimeField("Start Time", validators=[DataRequired()])
+    end_day = DateField("End Day", validators=[DataRequired()])
+    end_time = TimeField("End Time", validators=[DataRequired()])
     category = StringField("Category")
     submit = SubmitField("Submit")

goathacks/cli.py

@@ -23,8 +23,10 @@ gr = AppGroup("user")
 @click.option("--school", prompt=True)
 @click.option("--phone", prompt=True)
 @click.option("--gender", prompt=True)
+@click.option("--country", prompt=True)
+@click.option("--age", prompt=True)
 def create_user(email, first_name, last_name, password, school, phone, gender,
-                admin):
+                admin,age, country):
     """
     Creates a user
     """
@@ -48,7 +50,9 @@ def create_user(email, first_name, last_name, password, school, phone, gender,
             school=school,
             phone=phone,
             gender=gender,
-            is_admin=admin
+            is_admin=admin,
+            country=country,
+            age=age
             )
     db.session.add(user)
     db.session.commit()

goathacks/config.py.example

@@ -1,18 +0,0 @@
-SQLALCHEMY_DATABASE_URI="postgresql://localhost/goathacks"
-MAX_BEFORE_WAITLIST=1
-SECRET_KEY="bad-key-change-me"
-
-UPLOAD_FOLDER="./uploads/"
-
-DISCORD_LINK=None
-
-
-# Mail settings
-MAIL_SERVER="localhost"
-MAIL_PORT=25
-MAIL_USE_TLS=False
-MAIL_USE_SSL=False
-MAIL_USERNAME="dummy"
-MAIL_PASSWORD="dummy"
-MAIL_DEFAULT_SENDER="GoatHacks Team <hack@wpi.edu>"
-

goathacks/dashboard/__init__.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, current_app, flash, jsonify, render_template, request
+from flask import Blueprint, current_app, flash, jsonify, redirect, render_template, request, url_for
 from flask_login import current_user, login_required
 from werkzeug.utils import secure_filename
 
@@ -47,9 +47,17 @@ def resume():
             filename = current_user.first_name.lower() + '_' + current_user.last_name.lower() + '_' + str(
                 current_user.id) + '.' + resume.filename.split('.')[-1].lower()
             filename = secure_filename(filename)
+            if not os.path.exists(current_app.config['UPLOAD_FOLDER']):
+                try:
+                    os.makedirs(current_app.config['UPLOAD_FOLDER'])
+                except Exception:
+                    flash("Error saving resume. Contact acm-sysadmin@wpi.edu")
+                    return redirect(url_for("dashboard.home"))
             resume.save(os.path.join(current_app.config['UPLOAD_FOLDER'], filename))
-            return 'Resume uploaded!  <a href="/dashboard">Return to dashboard</a>'
-    return "Something went wrong. If this keeps happening, contact hack@wpi.edu for assistance"
+            flash("Resume uploaded!")
+            return redirect(url_for("dashboard.home"))
+    flash("Something went wrong. If this keeps happening, contact hack@wpi.edu for assistance")
+    return redirect(url_for("dashboard.home"))
 
 
 def allowed_file(filename):

goathacks/models.py

@@ -20,7 +20,13 @@ class User(db.Model, UserMixin):
     school = Column(String, nullable=True)
     phone = Column(String, nullable=True)
     gender = Column(String, nullable=True)
+    newsletter = Column(Boolean, nullable=False, default=False)
+    country = Column(String, nullable=False)
+    age = Column(Integer, nullable=False)
+    dietary_restrictions = Column(String, nullable=True)
 
+    def __str__(self):
+        return f"{self.first_name} {self.last_name} ({self.email})"
     def create_json_output(lis):
         hackers = []
 
@@ -48,7 +54,7 @@ def user_loader(user_id):
 @login.unauthorized_handler
 def unauth():
     flash("Please login first")
-    return redirect(url_for("registration.register"))
+    return redirect(url_for("registration.login"))
 
 
 class PwResetRequest(db.Model):
@@ -73,18 +79,21 @@ class Event(db.Model):
         events = []
 
         for e in lis:
-            events.append({
-                'id': e.id,
-                'name': e.name,
-                'description': e.description,
-                'location': e.location,
-                'start': e.start_time,
-                'end': e.end_time,
-                'category': e.category
-            })
+            events.append(e.create_json())
 
         return events
     
+    def create_json(self):
+        return {
+            "id": self.id,
+            "name": self.name,
+            "description": self.description,
+            "location": self.location,
+            "start_time": self.start_time.isoformat(),
+            "end_time": self.end_time.isoformat(),
+            "category": self.category
+        }
+
     def get_checkins(self):
         checkins = EventCheckins.query.filter_by(event_id=self.id).all()
 

goathacks/registration/__init__.py

@@ -30,7 +30,10 @@ def register():
         school = request.form.get('school')
         phone = request.form.get('phone_number')
         gender = request.form.get('gender')
-
+        country = request.form.get('country')
+        age = request.form.get('age')
+        dietary_restrictions = request.form.get('dietary_restrictions')
+        newsletter = request.form.get('newsletter')
 
         if password == password_c:
             # Passwords match!
@@ -51,7 +54,11 @@ def register():
                     waitlisted=waitlisted,
                     school=school,
                     phone=phone,
-                    gender=gender
+                    gender=gender,
+                    country=country,
+                    age=age,
+                    dietary_restrictions=dietary_restrictions,
+                    newsletter=newsletter
             )
             db.session.add(user)
             db.session.commit()

goathacks/registration/countries.csv

@@ -0,0 +1,249 @@
+United States of America,US,USA,840,ISO 3166-2:US,Americas,Northern America,"",019,021,""
+Afghanistan,AF,AFG,004,ISO 3166-2:AF,Asia,Southern Asia,"",142,034,""
+Åland Islands,AX,ALA,248,ISO 3166-2:AX,Europe,Northern Europe,"",150,154,""
+Albania,AL,ALB,008,ISO 3166-2:AL,Europe,Southern Europe,"",150,039,""
+Algeria,DZ,DZA,012,ISO 3166-2:DZ,Africa,Northern Africa,"",002,015,""
+American Samoa,AS,ASM,016,ISO 3166-2:AS,Oceania,Polynesia,"",009,061,""
+Andorra,AD,AND,020,ISO 3166-2:AD,Europe,Southern Europe,"",150,039,""
+Angola,AO,AGO,024,ISO 3166-2:AO,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Anguilla,AI,AIA,660,ISO 3166-2:AI,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Antarctica,AQ,ATA,010,ISO 3166-2:AQ,"","","","","",""
+Antigua and Barbuda,AG,ATG,028,ISO 3166-2:AG,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Argentina,AR,ARG,032,ISO 3166-2:AR,Americas,Latin America and the Caribbean,South America,019,419,005
+Armenia,AM,ARM,051,ISO 3166-2:AM,Asia,Western Asia,"",142,145,""
+Aruba,AW,ABW,533,ISO 3166-2:AW,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Australia,AU,AUS,036,ISO 3166-2:AU,Oceania,Australia and New Zealand,"",009,053,""
+Austria,AT,AUT,040,ISO 3166-2:AT,Europe,Western Europe,"",150,155,""
+Azerbaijan,AZ,AZE,031,ISO 3166-2:AZ,Asia,Western Asia,"",142,145,""
+Bahamas,BS,BHS,044,ISO 3166-2:BS,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Bahrain,BH,BHR,048,ISO 3166-2:BH,Asia,Western Asia,"",142,145,""
+Bangladesh,BD,BGD,050,ISO 3166-2:BD,Asia,Southern Asia,"",142,034,""
+Barbados,BB,BRB,052,ISO 3166-2:BB,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Belarus,BY,BLR,112,ISO 3166-2:BY,Europe,Eastern Europe,"",150,151,""
+Belgium,BE,BEL,056,ISO 3166-2:BE,Europe,Western Europe,"",150,155,""
+Belize,BZ,BLZ,084,ISO 3166-2:BZ,Americas,Latin America and the Caribbean,Central America,019,419,013
+Benin,BJ,BEN,204,ISO 3166-2:BJ,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Bermuda,BM,BMU,060,ISO 3166-2:BM,Americas,Northern America,"",019,021,""
+Bhutan,BT,BTN,064,ISO 3166-2:BT,Asia,Southern Asia,"",142,034,""
+"Bolivia, Plurinational State of",BO,BOL,068,ISO 3166-2:BO,Americas,Latin America and the Caribbean,South America,019,419,005
+"Bonaire, Sint Eustatius and Saba",BQ,BES,535,ISO 3166-2:BQ,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Bosnia and Herzegovina,BA,BIH,070,ISO 3166-2:BA,Europe,Southern Europe,"",150,039,""
+Botswana,BW,BWA,072,ISO 3166-2:BW,Africa,Sub-Saharan Africa,Southern Africa,002,202,018
+Bouvet Island,BV,BVT,074,ISO 3166-2:BV,Americas,Latin America and the Caribbean,South America,019,419,005
+Brazil,BR,BRA,076,ISO 3166-2:BR,Americas,Latin America and the Caribbean,South America,019,419,005
+British Indian Ocean Territory,IO,IOT,086,ISO 3166-2:IO,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Brunei Darussalam,BN,BRN,096,ISO 3166-2:BN,Asia,South-eastern Asia,"",142,035,""
+Bulgaria,BG,BGR,100,ISO 3166-2:BG,Europe,Eastern Europe,"",150,151,""
+Burkina Faso,BF,BFA,854,ISO 3166-2:BF,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Burundi,BI,BDI,108,ISO 3166-2:BI,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Cabo Verde,CV,CPV,132,ISO 3166-2:CV,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Cambodia,KH,KHM,116,ISO 3166-2:KH,Asia,South-eastern Asia,"",142,035,""
+Cameroon,CM,CMR,120,ISO 3166-2:CM,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Canada,CA,CAN,124,ISO 3166-2:CA,Americas,Northern America,"",019,021,""
+Cayman Islands,KY,CYM,136,ISO 3166-2:KY,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Central African Republic,CF,CAF,140,ISO 3166-2:CF,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Chad,TD,TCD,148,ISO 3166-2:TD,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Chile,CL,CHL,152,ISO 3166-2:CL,Americas,Latin America and the Caribbean,South America,019,419,005
+China,CN,CHN,156,ISO 3166-2:CN,Asia,Eastern Asia,"",142,030,""
+Christmas Island,CX,CXR,162,ISO 3166-2:CX,Oceania,Australia and New Zealand,"",009,053,""
+Cocos (Keeling) Islands,CC,CCK,166,ISO 3166-2:CC,Oceania,Australia and New Zealand,"",009,053,""
+Colombia,CO,COL,170,ISO 3166-2:CO,Americas,Latin America and the Caribbean,South America,019,419,005
+Comoros,KM,COM,174,ISO 3166-2:KM,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Congo,CG,COG,178,ISO 3166-2:CG,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+"Congo, Democratic Republic of the",CD,COD,180,ISO 3166-2:CD,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Cook Islands,CK,COK,184,ISO 3166-2:CK,Oceania,Polynesia,"",009,061,""
+Costa Rica,CR,CRI,188,ISO 3166-2:CR,Americas,Latin America and the Caribbean,Central America,019,419,013
+Côte d'Ivoire,CI,CIV,384,ISO 3166-2:CI,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Croatia,HR,HRV,191,ISO 3166-2:HR,Europe,Southern Europe,"",150,039,""
+Cuba,CU,CUB,192,ISO 3166-2:CU,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Curaçao,CW,CUW,531,ISO 3166-2:CW,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Cyprus,CY,CYP,196,ISO 3166-2:CY,Asia,Western Asia,"",142,145,""
+Czechia,CZ,CZE,203,ISO 3166-2:CZ,Europe,Eastern Europe,"",150,151,""
+Denmark,DK,DNK,208,ISO 3166-2:DK,Europe,Northern Europe,"",150,154,""
+Djibouti,DJ,DJI,262,ISO 3166-2:DJ,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Dominica,DM,DMA,212,ISO 3166-2:DM,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Dominican Republic,DO,DOM,214,ISO 3166-2:DO,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Ecuador,EC,ECU,218,ISO 3166-2:EC,Americas,Latin America and the Caribbean,South America,019,419,005
+Egypt,EG,EGY,818,ISO 3166-2:EG,Africa,Northern Africa,"",002,015,""
+El Salvador,SV,SLV,222,ISO 3166-2:SV,Americas,Latin America and the Caribbean,Central America,019,419,013
+Equatorial Guinea,GQ,GNQ,226,ISO 3166-2:GQ,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Eritrea,ER,ERI,232,ISO 3166-2:ER,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Estonia,EE,EST,233,ISO 3166-2:EE,Europe,Northern Europe,"",150,154,""
+Eswatini,SZ,SWZ,748,ISO 3166-2:SZ,Africa,Sub-Saharan Africa,Southern Africa,002,202,018
+Ethiopia,ET,ETH,231,ISO 3166-2:ET,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Falkland Islands (Malvinas),FK,FLK,238,ISO 3166-2:FK,Americas,Latin America and the Caribbean,South America,019,419,005
+Faroe Islands,FO,FRO,234,ISO 3166-2:FO,Europe,Northern Europe,"",150,154,""
+Fiji,FJ,FJI,242,ISO 3166-2:FJ,Oceania,Melanesia,"",009,054,""
+Finland,FI,FIN,246,ISO 3166-2:FI,Europe,Northern Europe,"",150,154,""
+France,FR,FRA,250,ISO 3166-2:FR,Europe,Western Europe,"",150,155,""
+French Guiana,GF,GUF,254,ISO 3166-2:GF,Americas,Latin America and the Caribbean,South America,019,419,005
+French Polynesia,PF,PYF,258,ISO 3166-2:PF,Oceania,Polynesia,"",009,061,""
+French Southern Territories,TF,ATF,260,ISO 3166-2:TF,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Gabon,GA,GAB,266,ISO 3166-2:GA,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Gambia,GM,GMB,270,ISO 3166-2:GM,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Georgia,GE,GEO,268,ISO 3166-2:GE,Asia,Western Asia,"",142,145,""
+Germany,DE,DEU,276,ISO 3166-2:DE,Europe,Western Europe,"",150,155,""
+Ghana,GH,GHA,288,ISO 3166-2:GH,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Gibraltar,GI,GIB,292,ISO 3166-2:GI,Europe,Southern Europe,"",150,039,""
+Greece,GR,GRC,300,ISO 3166-2:GR,Europe,Southern Europe,"",150,039,""
+Greenland,GL,GRL,304,ISO 3166-2:GL,Americas,Northern America,"",019,021,""
+Grenada,GD,GRD,308,ISO 3166-2:GD,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Guadeloupe,GP,GLP,312,ISO 3166-2:GP,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Guam,GU,GUM,316,ISO 3166-2:GU,Oceania,Micronesia,"",009,057,""
+Guatemala,GT,GTM,320,ISO 3166-2:GT,Americas,Latin America and the Caribbean,Central America,019,419,013
+Guernsey,GG,GGY,831,ISO 3166-2:GG,Europe,Northern Europe,"",150,154,""
+Guinea,GN,GIN,324,ISO 3166-2:GN,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Guinea-Bissau,GW,GNB,624,ISO 3166-2:GW,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Guyana,GY,GUY,328,ISO 3166-2:GY,Americas,Latin America and the Caribbean,South America,019,419,005
+Haiti,HT,HTI,332,ISO 3166-2:HT,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Heard Island and McDonald Islands,HM,HMD,334,ISO 3166-2:HM,Oceania,Australia and New Zealand,"",009,053,""
+Holy See,VA,VAT,336,ISO 3166-2:VA,Europe,Southern Europe,"",150,039,""
+Honduras,HN,HND,340,ISO 3166-2:HN,Americas,Latin America and the Caribbean,Central America,019,419,013
+Hong Kong,HK,HKG,344,ISO 3166-2:HK,Asia,Eastern Asia,"",142,030,""
+Hungary,HU,HUN,348,ISO 3166-2:HU,Europe,Eastern Europe,"",150,151,""
+Iceland,IS,ISL,352,ISO 3166-2:IS,Europe,Northern Europe,"",150,154,""
+India,IN,IND,356,ISO 3166-2:IN,Asia,Southern Asia,"",142,034,""
+Indonesia,ID,IDN,360,ISO 3166-2:ID,Asia,South-eastern Asia,"",142,035,""
+"Iran, Islamic Republic of",IR,IRN,364,ISO 3166-2:IR,Asia,Southern Asia,"",142,034,""
+Iraq,IQ,IRQ,368,ISO 3166-2:IQ,Asia,Western Asia,"",142,145,""
+Ireland,IE,IRL,372,ISO 3166-2:IE,Europe,Northern Europe,"",150,154,""
+Isle of Man,IM,IMN,833,ISO 3166-2:IM,Europe,Northern Europe,"",150,154,""
+Israel,IL,ISR,376,ISO 3166-2:IL,Asia,Western Asia,"",142,145,""
+Italy,IT,ITA,380,ISO 3166-2:IT,Europe,Southern Europe,"",150,039,""
+Jamaica,JM,JAM,388,ISO 3166-2:JM,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Japan,JP,JPN,392,ISO 3166-2:JP,Asia,Eastern Asia,"",142,030,""
+Jersey,JE,JEY,832,ISO 3166-2:JE,Europe,Northern Europe,"",150,154,""
+Jordan,JO,JOR,400,ISO 3166-2:JO,Asia,Western Asia,"",142,145,""
+Kazakhstan,KZ,KAZ,398,ISO 3166-2:KZ,Asia,Central Asia,"",142,143,""
+Kenya,KE,KEN,404,ISO 3166-2:KE,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Kiribati,KI,KIR,296,ISO 3166-2:KI,Oceania,Micronesia,"",009,057,""
+"Korea, Democratic People's Republic of",KP,PRK,408,ISO 3166-2:KP,Asia,Eastern Asia,"",142,030,""
+"Korea, Republic of",KR,KOR,410,ISO 3166-2:KR,Asia,Eastern Asia,"",142,030,""
+Kuwait,KW,KWT,414,ISO 3166-2:KW,Asia,Western Asia,"",142,145,""
+Kyrgyzstan,KG,KGZ,417,ISO 3166-2:KG,Asia,Central Asia,"",142,143,""
+Lao People's Democratic Republic,LA,LAO,418,ISO 3166-2:LA,Asia,South-eastern Asia,"",142,035,""
+Latvia,LV,LVA,428,ISO 3166-2:LV,Europe,Northern Europe,"",150,154,""
+Lebanon,LB,LBN,422,ISO 3166-2:LB,Asia,Western Asia,"",142,145,""
+Lesotho,LS,LSO,426,ISO 3166-2:LS,Africa,Sub-Saharan Africa,Southern Africa,002,202,018
+Liberia,LR,LBR,430,ISO 3166-2:LR,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Libya,LY,LBY,434,ISO 3166-2:LY,Africa,Northern Africa,"",002,015,""
+Liechtenstein,LI,LIE,438,ISO 3166-2:LI,Europe,Western Europe,"",150,155,""
+Lithuania,LT,LTU,440,ISO 3166-2:LT,Europe,Northern Europe,"",150,154,""
+Luxembourg,LU,LUX,442,ISO 3166-2:LU,Europe,Western Europe,"",150,155,""
+Macao,MO,MAC,446,ISO 3166-2:MO,Asia,Eastern Asia,"",142,030,""
+Madagascar,MG,MDG,450,ISO 3166-2:MG,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Malawi,MW,MWI,454,ISO 3166-2:MW,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Malaysia,MY,MYS,458,ISO 3166-2:MY,Asia,South-eastern Asia,"",142,035,""
+Maldives,MV,MDV,462,ISO 3166-2:MV,Asia,Southern Asia,"",142,034,""
+Mali,ML,MLI,466,ISO 3166-2:ML,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Malta,MT,MLT,470,ISO 3166-2:MT,Europe,Southern Europe,"",150,039,""
+Marshall Islands,MH,MHL,584,ISO 3166-2:MH,Oceania,Micronesia,"",009,057,""
+Martinique,MQ,MTQ,474,ISO 3166-2:MQ,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Mauritania,MR,MRT,478,ISO 3166-2:MR,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Mauritius,MU,MUS,480,ISO 3166-2:MU,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Mayotte,YT,MYT,175,ISO 3166-2:YT,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Mexico,MX,MEX,484,ISO 3166-2:MX,Americas,Latin America and the Caribbean,Central America,019,419,013
+"Micronesia, Federated States of",FM,FSM,583,ISO 3166-2:FM,Oceania,Micronesia,"",009,057,""
+"Moldova, Republic of",MD,MDA,498,ISO 3166-2:MD,Europe,Eastern Europe,"",150,151,""
+Monaco,MC,MCO,492,ISO 3166-2:MC,Europe,Western Europe,"",150,155,""
+Mongolia,MN,MNG,496,ISO 3166-2:MN,Asia,Eastern Asia,"",142,030,""
+Montenegro,ME,MNE,499,ISO 3166-2:ME,Europe,Southern Europe,"",150,039,""
+Montserrat,MS,MSR,500,ISO 3166-2:MS,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Morocco,MA,MAR,504,ISO 3166-2:MA,Africa,Northern Africa,"",002,015,""
+Mozambique,MZ,MOZ,508,ISO 3166-2:MZ,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Myanmar,MM,MMR,104,ISO 3166-2:MM,Asia,South-eastern Asia,"",142,035,""
+Namibia,NA,NAM,516,ISO 3166-2:NA,Africa,Sub-Saharan Africa,Southern Africa,002,202,018
+Nauru,NR,NRU,520,ISO 3166-2:NR,Oceania,Micronesia,"",009,057,""
+Nepal,NP,NPL,524,ISO 3166-2:NP,Asia,Southern Asia,"",142,034,""
+"Netherlands, Kingdom of the",NL,NLD,528,ISO 3166-2:NL,Europe,Western Europe,"",150,155,""
+New Caledonia,NC,NCL,540,ISO 3166-2:NC,Oceania,Melanesia,"",009,054,""
+New Zealand,NZ,NZL,554,ISO 3166-2:NZ,Oceania,Australia and New Zealand,"",009,053,""
+Nicaragua,NI,NIC,558,ISO 3166-2:NI,Americas,Latin America and the Caribbean,Central America,019,419,013
+Niger,NE,NER,562,ISO 3166-2:NE,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Nigeria,NG,NGA,566,ISO 3166-2:NG,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Niue,NU,NIU,570,ISO 3166-2:NU,Oceania,Polynesia,"",009,061,""
+Norfolk Island,NF,NFK,574,ISO 3166-2:NF,Oceania,Australia and New Zealand,"",009,053,""
+North Macedonia,MK,MKD,807,ISO 3166-2:MK,Europe,Southern Europe,"",150,039,""
+Northern Mariana Islands,MP,MNP,580,ISO 3166-2:MP,Oceania,Micronesia,"",009,057,""
+Norway,NO,NOR,578,ISO 3166-2:NO,Europe,Northern Europe,"",150,154,""
+Oman,OM,OMN,512,ISO 3166-2:OM,Asia,Western Asia,"",142,145,""
+Pakistan,PK,PAK,586,ISO 3166-2:PK,Asia,Southern Asia,"",142,034,""
+Palau,PW,PLW,585,ISO 3166-2:PW,Oceania,Micronesia,"",009,057,""
+"Palestine, State of",PS,PSE,275,ISO 3166-2:PS,Asia,Western Asia,"",142,145,""
+Panama,PA,PAN,591,ISO 3166-2:PA,Americas,Latin America and the Caribbean,Central America,019,419,013
+Papua New Guinea,PG,PNG,598,ISO 3166-2:PG,Oceania,Melanesia,"",009,054,""
+Paraguay,PY,PRY,600,ISO 3166-2:PY,Americas,Latin America and the Caribbean,South America,019,419,005
+Peru,PE,PER,604,ISO 3166-2:PE,Americas,Latin America and the Caribbean,South America,019,419,005
+Philippines,PH,PHL,608,ISO 3166-2:PH,Asia,South-eastern Asia,"",142,035,""
+Pitcairn,PN,PCN,612,ISO 3166-2:PN,Oceania,Polynesia,"",009,061,""
+Poland,PL,POL,616,ISO 3166-2:PL,Europe,Eastern Europe,"",150,151,""
+Portugal,PT,PRT,620,ISO 3166-2:PT,Europe,Southern Europe,"",150,039,""
+Puerto Rico,PR,PRI,630,ISO 3166-2:PR,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Qatar,QA,QAT,634,ISO 3166-2:QA,Asia,Western Asia,"",142,145,""
+Réunion,RE,REU,638,ISO 3166-2:RE,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Romania,RO,ROU,642,ISO 3166-2:RO,Europe,Eastern Europe,"",150,151,""
+Russian Federation,RU,RUS,643,ISO 3166-2:RU,Europe,Eastern Europe,"",150,151,""
+Rwanda,RW,RWA,646,ISO 3166-2:RW,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Saint Barthélemy,BL,BLM,652,ISO 3166-2:BL,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+"Saint Helena, Ascension and Tristan da Cunha",SH,SHN,654,ISO 3166-2:SH,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Saint Kitts and Nevis,KN,KNA,659,ISO 3166-2:KN,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Saint Lucia,LC,LCA,662,ISO 3166-2:LC,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Saint Martin (French part),MF,MAF,663,ISO 3166-2:MF,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Saint Pierre and Miquelon,PM,SPM,666,ISO 3166-2:PM,Americas,Northern America,"",019,021,""
+Saint Vincent and the Grenadines,VC,VCT,670,ISO 3166-2:VC,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Samoa,WS,WSM,882,ISO 3166-2:WS,Oceania,Polynesia,"",009,061,""
+San Marino,SM,SMR,674,ISO 3166-2:SM,Europe,Southern Europe,"",150,039,""
+Sao Tome and Principe,ST,STP,678,ISO 3166-2:ST,Africa,Sub-Saharan Africa,Middle Africa,002,202,017
+Saudi Arabia,SA,SAU,682,ISO 3166-2:SA,Asia,Western Asia,"",142,145,""
+Senegal,SN,SEN,686,ISO 3166-2:SN,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Serbia,RS,SRB,688,ISO 3166-2:RS,Europe,Southern Europe,"",150,039,""
+Seychelles,SC,SYC,690,ISO 3166-2:SC,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Sierra Leone,SL,SLE,694,ISO 3166-2:SL,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Singapore,SG,SGP,702,ISO 3166-2:SG,Asia,South-eastern Asia,"",142,035,""
+Sint Maarten (Dutch part),SX,SXM,534,ISO 3166-2:SX,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Slovakia,SK,SVK,703,ISO 3166-2:SK,Europe,Eastern Europe,"",150,151,""
+Slovenia,SI,SVN,705,ISO 3166-2:SI,Europe,Southern Europe,"",150,039,""
+Solomon Islands,SB,SLB,090,ISO 3166-2:SB,Oceania,Melanesia,"",009,054,""
+Somalia,SO,SOM,706,ISO 3166-2:SO,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+South Africa,ZA,ZAF,710,ISO 3166-2:ZA,Africa,Sub-Saharan Africa,Southern Africa,002,202,018
+South Georgia and the South Sandwich Islands,GS,SGS,239,ISO 3166-2:GS,Americas,Latin America and the Caribbean,South America,019,419,005
+South Sudan,SS,SSD,728,ISO 3166-2:SS,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Spain,ES,ESP,724,ISO 3166-2:ES,Europe,Southern Europe,"",150,039,""
+Sri Lanka,LK,LKA,144,ISO 3166-2:LK,Asia,Southern Asia,"",142,034,""
+Sudan,SD,SDN,729,ISO 3166-2:SD,Africa,Northern Africa,"",002,015,""
+Suriname,SR,SUR,740,ISO 3166-2:SR,Americas,Latin America and the Caribbean,South America,019,419,005
+Svalbard and Jan Mayen,SJ,SJM,744,ISO 3166-2:SJ,Europe,Northern Europe,"",150,154,""
+Sweden,SE,SWE,752,ISO 3166-2:SE,Europe,Northern Europe,"",150,154,""
+Switzerland,CH,CHE,756,ISO 3166-2:CH,Europe,Western Europe,"",150,155,""
+Syrian Arab Republic,SY,SYR,760,ISO 3166-2:SY,Asia,Western Asia,"",142,145,""
+"Taiwan, Province of China",TW,TWN,158,ISO 3166-2:TW,,,,,,
+Tajikistan,TJ,TJK,762,ISO 3166-2:TJ,Asia,Central Asia,"",142,143,""
+"Tanzania, United Republic of",TZ,TZA,834,ISO 3166-2:TZ,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Thailand,TH,THA,764,ISO 3166-2:TH,Asia,South-eastern Asia,"",142,035,""
+Timor-Leste,TL,TLS,626,ISO 3166-2:TL,Asia,South-eastern Asia,"",142,035,""
+Togo,TG,TGO,768,ISO 3166-2:TG,Africa,Sub-Saharan Africa,Western Africa,002,202,011
+Tokelau,TK,TKL,772,ISO 3166-2:TK,Oceania,Polynesia,"",009,061,""
+Tonga,TO,TON,776,ISO 3166-2:TO,Oceania,Polynesia,"",009,061,""
+Trinidad and Tobago,TT,TTO,780,ISO 3166-2:TT,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Tunisia,TN,TUN,788,ISO 3166-2:TN,Africa,Northern Africa,"",002,015,""
+Türkiye,TR,TUR,792,ISO 3166-2:TR,Asia,Western Asia,"",142,145,""
+Turkmenistan,TM,TKM,795,ISO 3166-2:TM,Asia,Central Asia,"",142,143,""
+Turks and Caicos Islands,TC,TCA,796,ISO 3166-2:TC,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Tuvalu,TV,TUV,798,ISO 3166-2:TV,Oceania,Polynesia,"",009,061,""
+Uganda,UG,UGA,800,ISO 3166-2:UG,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Ukraine,UA,UKR,804,ISO 3166-2:UA,Europe,Eastern Europe,"",150,151,""
+United Arab Emirates,AE,ARE,784,ISO 3166-2:AE,Asia,Western Asia,"",142,145,""
+United Kingdom of Great Britain and Northern Ireland,GB,GBR,826,ISO 3166-2:GB,Europe,Northern Europe,"",150,154,""
+United States Minor Outlying Islands,UM,UMI,581,ISO 3166-2:UM,Oceania,Micronesia,"",009,057,""
+Uruguay,UY,URY,858,ISO 3166-2:UY,Americas,Latin America and the Caribbean,South America,019,419,005
+Uzbekistan,UZ,UZB,860,ISO 3166-2:UZ,Asia,Central Asia,"",142,143,""
+Vanuatu,VU,VUT,548,ISO 3166-2:VU,Oceania,Melanesia,"",009,054,""
+"Venezuela, Bolivarian Republic of",VE,VEN,862,ISO 3166-2:VE,Americas,Latin America and the Caribbean,South America,019,419,005
+Viet Nam,VN,VNM,704,ISO 3166-2:VN,Asia,South-eastern Asia,"",142,035,""
+Virgin Islands (British),VG,VGB,092,ISO 3166-2:VG,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Virgin Islands (U.S.),VI,VIR,850,ISO 3166-2:VI,Americas,Latin America and the Caribbean,Caribbean,019,419,029
+Wallis and Futuna,WF,WLF,876,ISO 3166-2:WF,Oceania,Polynesia,"",009,061,""
+Western Sahara,EH,ESH,732,ISO 3166-2:EH,Africa,Northern Africa,"",002,015,""
+Yemen,YE,YEM,887,ISO 3166-2:YE,Asia,Western Asia,"",142,145,""
+Zambia,ZM,ZMB,894,ISO 3166-2:ZM,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014
+Zimbabwe,ZW,ZWE,716,ISO 3166-2:ZW,Africa,Sub-Saharan Africa,Eastern Africa,002,202,014

goathacks/registration/forms.py

@@ -1,8 +1,13 @@
 from flask_wtf import FlaskForm
-from wtforms import BooleanField, PasswordField, SelectField, StringField, SubmitField, widgets
+from wtforms import BooleanField, IntegerField, PasswordField, SelectField, StringField, SubmitField, widgets
 from wtforms.validators import DataRequired
+import os
 
 class RegisterForm(FlaskForm):
+    __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__)))
+    schools_list = open(os.path.join(__location__, 'schools.txt')).read().split("\n")
+    countries_list = open(os.path.join(__location__, 'countries.csv')).read().split("\n")
+
     email = StringField("Email", validators=[DataRequired()])
     first_name = StringField("Preferred First Name",
                              validators=[DataRequired()])
@@ -10,12 +15,18 @@ class RegisterForm(FlaskForm):
     password = PasswordField("Password", validators=[DataRequired()])
     password_confirm = PasswordField("Confirm Password",
                                      validators=[DataRequired()])
-    school = StringField("School/University", validators=[DataRequired()])
+    school = SelectField("School", choices=[(school, school) for school in schools_list], widget=widgets.Select())
     phone_number = StringField("Phone number", validators=[DataRequired()])
+    age = IntegerField("Age", validators=[DataRequired()])
+    dietary_restrictions = StringField("Dietary Restrictions (Optional)")
     gender = SelectField("Gender", choices=[("F", "Female"), ("M", "Male"),
                                             ("NB", "Non-binary/Other")],
                          widget=widgets.Select())
+    country = SelectField("Country", choices=[(country.split(",")[0], country.split(",")[0]) for country in countries_list], widget=widgets.Select())
+    newsletter = BooleanField("Subscribe to the MLH newsletter?")
     agree_coc = BooleanField("I confirm that I have read and agree to the Code of Conduct", validators=[DataRequired()])
+    logistics = BooleanField("I authorize you to share my application/registration with Major League Hacking for event administration, ranking, and MLH administration in-line with the MLH privacy policy.I further agree to the terms of both the MLH Contest Terms and Conditions and the MLH Privacy Policy.", validators=[DataRequired()])
+
     submit = SubmitField("Register")
 
 class LoginForm(FlaskForm):

goathacks/static/css/style.css

@@ -14,5 +14,5 @@
 
 body {
   min-height: 100vh;
-  background-color: #003049;
+  background-color: #000000;
 }

goathacks/static/css/style.scss

@@ -1,5 +1,5 @@
 $color-nav-bg: #974355;
-$color-bg: #003049;
+$color-bg: #000000;
 
 .navbar-dark, .modal-header, .table-header {
     background-color: $color-nav-bg;

goathacks/templates/admin-layout.html

@@ -20,6 +20,7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="nav navbar-nav me-auto mb-2 mb-lg-0">
                 {{ render_nav_item('admin.home', 'User List')}}
+                {{ render_nav_item('admin.admin_list', 'Admin List')}}
                 {{ render_nav_item('admin.list_events', 'Event List')}}
                 {{ render_nav_item('admin.mail', 'Bulk Mail Tool')}}
             </ul>

goathacks/templates/dashboard.html

@@ -15,6 +15,12 @@
         <p class="card-text">Let us know if you have any questions by sending
         them to <a href="mailto:hack@wpi.edu">hack@wpi.edu</a></p>
 
+        {% if not current_user.waitlisted and config['DISCORD_LINK'] %}
+        <p>Make sure to join our Discord to get the latest updates!</p>
+            <button type="button" class="btn btn-primary mb-3"><a href="{{ config['DISCORD_LINK']
+                          }}" class="link-light">Discord</a></button>
+        {% endif %}
+
         <div class="row center justify-content-center">
             <form method="post">
                 {{ form.csrf_token() }}
@@ -33,7 +39,7 @@
         </div>
         <hr/>
         <div class="row center justify-content-center">
-            <form method="post" action={{url_for('dashboard.resume')}}"
+            <form method="post" action="{{url_for('dashboard.resume')}}"
                   enctype="multipart/form-data">
                 {{ resform.csrf_token() }}
                 <p><b>If you'd like, add your resume to send to

goathacks/templates/events/list.html

@@ -19,7 +19,7 @@
                 <th>Category</th>
                 <th>Checked in</th>
                 <th>QR Code</th>
-                <th><a href="{{url_for('admin.new_event')}}">New</a></th>
+                <th><a href="#editModal" data-bs-toggle="modal" data-id="0">New</a></th>
             </tr>
         </thead>
         <tbody>
@@ -34,11 +34,166 @@
                 <td>{{ event.get_checkins()|length }}</td>
                 <td><a href='{{ url_for("admin.qrcode_event", id=event.id)
                                          }}'>QR Code</a></td>
-                <td><a href="{{url_for('admin.edit_event', id=event.id)}}">Edit</a></td>
+                <td><a href="#editModal" data-bs-toggle="modal" data-id="{{ event.id}}" >Edit</a></td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
 </div>
 </div>
+
+<div class="modal" id="editModal" tabindex="-1" aria-labelledby="editModalLabel"
+                                                aria-hidden="true">
+      <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title fs-5" id="editModalLabel">Event</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <form class="form" id="edit-form" action="/admin/events/0" role="form" method="post">
+          <div class="modal-body">
+          {{ form.csrf_token }}
+            <div class="form-floating mb-3 required">
+                {{ form.name(class="form-control") }}
+                {{ form.name.label() }}
+            </div>
+            <div class="form-floating mb-3">
+                {{ form.description(class="form-control") }}
+                {{ form.description.label() }}
+            </div>
+            <div class="form-floating mb-3 required">
+                {{ form.location(class="form-control") }}
+                {{ form.location.label() }}
+            </div>
+            <div class="form-floating mb-3">
+                {{ form.category(class="form-control") }}
+                {{ form.category.label() }}
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="form-floating mb-3 required">
+                        {{ form.start_day(class="form-control") }}
+                        {{ form.start_day.label() }}
+                    </div> 
+                </div>
+                <div class="col">
+                    <div class="form-floating mb-3 required">
+                        {{ form.start_time(class="form-control") }}
+                        {{ form.start_time.label() }}
+                    </div>                    
+                </div> 
+            </div> 
+            <div class="row">
+                <div class="col">
+                    <div class="form-floating mb-3 required">
+                        {{ form.end_day(class="form-control") }}
+                        {{ form.end_day.label() }}
+                    </div> 
+                </div>
+                <div class="col">
+                    <div class="form-floating mb-3 required">
+                        {{ form.end_time(class="form-control") }}
+                        {{ form.end_time.label() }}
+                    </div>                    
+                </div> 
+            </div>  
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-danger" data-id="0" id="delete">Delete</button>
+            <button type="submit" class="btn btn-primary" id="edit-save">Save changes</button>
+          </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<script src="{{ url_for('static', filename='js/jquery-3.6.3.min.js') }}" charset="utf-8"></script>
+
+<script charset="utf-8">
+    const editButton = document.getElementById("edit-save")
+
+    $('#delete').on("click", (event) => {
+        if (window.confirm("Delete this event?")) {
+            console.log("Got OK")
+            deleteButton = document.getElementById("delete")
+            id = deleteButton.dataset.id
+            $.get(`/admin/event/${id}/delete`, (data) => {
+                if (data.status == "error") {
+                    window.alert(`Error: ${data.message}`)
+                } else {
+                    window.alert("Success")
+                }
+                location.reload()
+            })
+        }
+    })
+
+    $('#editModal').on('show.bs.modal', function(event) {
+        var modal = $(this)
+                modal.find('#name').val('')
+        modal.find('#location').val('')
+        modal.find('#description').val('')
+        modal.find('#start_day').val('')
+        modal.find('#start_time').val('')
+        modal.find('#end_day').val('')
+        modal.find('#end_time').val('')
+
+        var button = $(event.relatedTarget)
+        var name,description,loc,start_time,start_day,end_time,end_day
+        id = button.data('id')
+
+        saveButton = document.getElementById("edit-save")
+        saveButton.dataset.id = id
+
+        deleteButton = document.getElementById("delete")
+        deleteButton.dataset.id = id
+
+        editForm = document.getElementById("edit-form")
+        editForm.action = "/admin/event/" + id
+
+        if (id) {
+            $.get(`/admin/event/${id}`, (data) => {
+
+                if (data.status == "error") {
+                    // This is a new event, do nothing!
+                } else {
+                    name = data.name,
+                    description = data.description,
+                    loc = data.location,
+                    category = data.category
+
+                    start = new Date(data.start_time) 
+
+                    var day = ("0" + start.getDate()).slice(-2);
+                    var month = ("0" + (start.getMonth() + 1)).slice(-2);
+
+                    start_day = start.getFullYear()+"-"+(month)+"-"+(day); 
+                    start_time = `${start.getHours()}:${padTwoDigits(start.getMinutes())}`
+                    end = new Date(data.end_time)
+
+                    var day = ("0" + end.getDate()).slice(-2);
+                    var month = ("0" + (end.getMonth() + 1)).slice(-2);
+
+                    end_day = end.getFullYear()+"-"+(month)+"-"+(day); 
+                    end_time = `${end.getHours()}:${padTwoDigits(end.getMinutes())}`
+                }
+
+                    modal.find('#name').val(name)
+                    modal.find('#location').val(loc)
+                    modal.find('#description').val(description)
+                    modal.find('#start_day').val(start_day)
+                    modal.find('#start_time').val(start_time)
+                    modal.find('#end_day').val(end_day)
+                    modal.find('#end_time').val(end_time)
+                    modal.find('#category').val(category)
+
+               
+            });
+        }
+    })
+
+    function padTwoDigits(num) {
+        return num.toString().padStart(2, '0')
+    }
+</script>
 {% endblock %}

goathacks/templates/home

@@ -1 +1 @@
-Subproject commit 8d8a691aad1cea4037bb9d33ddf7230d8d272597
+Subproject commit db2a7a865f9b3865fa2180b1b53b1c2d2640be81

goathacks/templates/register.html

@@ -45,21 +45,64 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-floating mb-3 required">
-                    {{ form.school(class="form-control") }}
-                    {{ form.school.label() }}
+                <div class="row">
+                  <div class="col">
+                    <div class="form-floating mb-3 required">
+                      {{ form.school(class="form-control") }}
+                      {{ form.school.label() }}
+                    </div>
+                  </div>
+                  <div class="col">
+                      <div class="form-floating mb-3 required">
+                          {{ form.country(class="form-control") }}
+                          {{ form.country.label() }}
+                      </div>
+                  </div>
                 </div>
-                <div class="form-floating mb-3 required">
+               
+                <div class="row">
+                    <div class="col">
+                        <div class="form-floating mb-3 required">
                     {{ form.phone_number(class="form-control") }}
-                    {{ form.phone_number.label() }}
+                            {{ form.phone_number.label() }}
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="form-floating mb-3 required">
+                            {{ form.age(class="form-control") }}
+                            {{ form.age.label() }}
+                        </div>
+                    </div>
                 </div>
                 <div class="form-floating mb-3 required">
                     {{ form.gender(class="form-control") }}
                     {{ form.gender.label() }}
                 </div>
+                <div class="form-floating mb-3">
+                    {{ form.dietary_restrictions(class="form-control") }}
+                    {{ form.dietary_restrictions.label() }}
+                </div>
                 <div class="form-check mb-3 required">
                     {{ form.agree_coc }}
-                    {{ form.agree_coc.label() }}
+                    I confirm that I have read and agree to the <a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf" target="_blank">MLH Code of Conduct</a>
+                </div>
+                <div class="form-check mb-3 required">
+                    {{ form.logistics }}
+I authorize you to share my application/registration with Major League Hacking
+for event administration, ranking, and MLH administration in-line with the MLH
+privacy policy. I further agree to the terms of both the <a
+                                                                href="https://github.com/MLH/mlh-policies/blob/main/contest-terms.md">MLH
+                                                                Contest Terms
+                                                                and
+                                                                Conditions</a>
+                                                            and the <a
+                                                                            href="https://github.com/MLH/mlh-policies/blob/main/privacy-policy.md">MLH
+                                                                            Privacy
+                                                                            Policy</a>.
+                </div>
+                <div class="form-check mb-3">
+                    {{ form.newsletter }}
+                    Subscribe to the MLH newsletter?
                 </div>
                 {{ render_field(form.submit) }}
             </form>

migrations/versions/f5b70c6e73eb_.py

@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: f5b70c6e73eb
+Revises: 858e0d45876f
+Create Date: 2024-10-31 13:04:48.500263
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f5b70c6e73eb'
+down_revision = '858e0d45876f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('newsletter', sa.Boolean(), nullable=False))
+        batch_op.add_column(sa.Column('country', sa.String(), nullable=False))
+        batch_op.add_column(sa.Column('age', sa.Integer(), nullable=False))
+        batch_op.add_column(sa.Column('dietary_restrictions', sa.String(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.drop_column('dietary_restrictions')
+        batch_op.drop_column('age')
+        batch_op.drop_column('country')
+        batch_op.drop_column('newsletter')
+
+    # ### end Alembic commands ###

requirements.txt

@@ -9,7 +9,7 @@ Flask-Login==0.6.2
 Flask-Migrate==4.0.0
 Flask-SQLAlchemy==3.0.2
 Flask-WTF==1.0.1
-greenlet==2.0.1
+greenlet
 itsdangerous==2.1.2
 Jinja2==3.1.2
 Mako==1.2.4
@@ -19,10 +19,11 @@ psycopg2==2.9.5
 pynvim==0.4.3
 python-dotenv==0.21.0
 SQLAlchemy==1.4.44
-uWSGI==2.0.21
+uWSGI
 Werkzeug==2.2.2
 WTForms==3.0.1
 ulid
 bootstrap-flask
 Font-Awesome-Flask
 tabulate
+markupsafe