diff --git a/.gitmodules b/.gitmodules index 24175f7..807cb70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "goathacks/templates/home"] path = goathacks/templates/home url = https://github.com/WPI-ACM/Hack-WPI-Static - branch = master + branch = 2023-dev diff --git a/goathacks/cli.py b/goathacks/cli.py index e4a56ba..340af87 100644 --- a/goathacks/cli.py +++ b/goathacks/cli.py @@ -9,8 +9,6 @@ from goathacks.registration import bp from goathacks import db, mail from goathacks.models import User -from tabulate import tabulate - gr = AppGroup("user") @gr.command('create') @@ -124,56 +122,3 @@ def drop_user(email, confirm): db.session.commit() click.echo(f"Dropped {user.first_name}'s registration") -@gr.command("list") -def list_users(): - """ - Gets a list of all users - """ - users = User.query.all() - - def make_table_content(user): - return [user.email, f"{user.first_name} {user.last_name}", user.waitlisted, user.is_admin] - - table = map(make_table_content, users) - - print(tabulate(table, headers=["Email", "Name", "Waitlisted", "Admin"])) - - -@gr.command("autopromote") -def autopromote_users(): - """ - Runs through and automatically promotes users up to the waitlist limit - """ - WAITLIST_LIMIT = current_app.config['MAX_BEFORE_WAITLIST'] - num_confirmed = db.session.query(User).filter(User.waitlisted == False).count() - click.echo(f"Got {num_confirmed} confirmed attendees") - num_waitlisted = db.session.query(User).filter(User.waitlisted == True).count() - click.echo(f"Got {num_waitlisted} waitlisted attendees") - - num_to_promote = WAITLIST_LIMIT - num_confirmed - - if num_to_promote > num_waitlisted: - num_to_promote = num_waitlisted - - click.echo(f"About to promote {str(num_to_promote)} attendees from waitlist") - - users = db.session.query(User).filter(User.waitlisted == True).all() - - num_promoted = 0 - num_to_promote_orig = num_to_promote - - for u in users: - if num_to_promote > 0: - click.echo(f"Attempting to promote {u.email} ({u.id})") - u.waitlisted = False - db.session.commit() - msg = Message("Waitlist Promotion") - msg.add_recipient(u.email) - msg.sender = ("GoatHacks Team", "hack@wpi.edu") - msg.body = render_template("emails/waitlist_promotion.txt", user=u) - mail.send(msg) - num_promoted += 1 - num_to_promote -= 1 - - click.echo(f"Promoted {num_promoted}/{num_to_promote_orig} attendees off the waitlist!") - diff --git a/goathacks/config.py.example b/goathacks/config.py.example index fb85c63..f9421b0 100644 --- a/goathacks/config.py.example +++ b/goathacks/config.py.example @@ -4,8 +4,6 @@ SECRET_KEY="bad-key-change-me" UPLOAD_FOLDER="./uploads/" -DISCORD_LINK=None - # Mail settings MAIL_SERVER="localhost" diff --git a/goathacks/templates/dashboard.html b/goathacks/templates/dashboard.html index 44c9656..26680c6 100644 --- a/goathacks/templates/dashboard.html +++ b/goathacks/templates/dashboard.html @@ -30,13 +30,10 @@ Forgot to upload your resume while registering? No worries, submit it below.