Re-add Discord link to participant dashboard

can't believe it took us this long

config.py

@@ -11,7 +11,8 @@ class Config():
 
     SQLALCHEMY_DATABASE_URI = dotenv_values().get("SQLALCHEMY_DATABASE_URI") or "postgresql://localhost/goathacks"
 
-    MAX_BEFORE_WAITLIST = dotenv_values().get("MAX_BEFORE_WAITLIST") or 1
+    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/"

goathacks/admin/__init__.py

@@ -4,8 +4,6 @@ from flask_mail import Message
 
 from goathacks.models import User
 
-from sqlalchemy.exc import IntegrityError
-
 bp = Blueprint("admin", __name__, url_prefix="/admin")
 
 from goathacks import db, mail as app_mail
@@ -223,44 +221,6 @@ def hackers():
     users = User.query.all()
     return User.create_json_output(users)
 
-@bp.route("/updateHacker", methods=["POST"])
-@login_required
-def updateHacker():
-    if not current_user.is_admin:
-        return redirect(url_for("dashboard.home"))
-    
-    # get params from json
-    hacker_id = request.json['hacker_id']
-    change_field = request.json['change_field']
-    new_val = request.json['new_val']
-
-    # find the user in db
-    user = User.query.filter_by(id=hacker_id).one()
-    if user is None:
-        return {"status": "error", "msg": "user not found"}
-    
-
-    # update the hacker depending on change_field
-    match change_field:
-        case "first_name":
-            user.first_name = new_val
-        case "last_name":
-            user.last_name = new_val
-        case "school":
-            user.school = new_val
-        case "phone":
-            user.phone = new_val
-
-    try:
-        db.session.commit()
-    except IntegrityError as err:
-        db.session.rollback()
-        flash("Could not update user information for user " + hacker_id)
-        return {"status": "error"}
-
-        
-    return {"status": "success"}
-
 import json
 import csv
 from io import StringIO

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>'
+            flash("Resume uploaded!")
-    return "Something went wrong. If this keeps happening, contact hack@wpi.edu for assistance"
+            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/registration/__init__.py

@@ -6,7 +6,6 @@ from goathacks.registration.forms import LoginForm, PwResetForm, RegisterForm, R
 from werkzeug.security import check_password_hash, generate_password_hash
 from flask_mail import Message
 import ulid
-from sqlalchemy.exc import IntegrityError
 
 from goathacks import db, mail as app_mail
 from goathacks.models import PwResetRequest, User
@@ -61,20 +60,8 @@ def register():
                     dietary_restrictions=dietary_restrictions,
                     newsletter=newsletter
             )
-
+            db.session.add(user)
-            #try to add the user to the database, checking for duplicate users
+            db.session.commit()
-            try:
-                db.session.add(user)
-                db.session.commit()
-            except IntegrityError as err:
-                db.session.rollback()
-                if "duplicate key value violates unique constraint" in str(err):
-                    flash("User with email " + email + " already exists.")
-                else:
-                    flash("An unknown error occurred.")
-                return redirect(url_for("registration.login"))
-
-            #user successfully registered, so login
             flask_login.login_user(user)
 
             if waitlisted:
@@ -142,10 +129,9 @@ def reset():
                     user_id=user.id,
                     expires=datetime.now() + timedelta(minutes=30)
                     )
-            
             db.session.add(r)
             db.session.commit()
-
+            
             msg = Message("GoatHacks - Password Reset Request")
             msg.add_recipient(user.email)
             msg.body = render_template("emails/password_reset.txt", code=r.id)

goathacks/registration/forms.py

@@ -22,8 +22,8 @@ class RegisterForm(FlaskForm):
     gender = SelectField("Gender", choices=[("F", "Female"), ("M", "Male"),
                                             ("NB", "Non-binary/Other")],
                          widget=widgets.Select())
-    country = SelectField("Country of Origin", choices=[(country.split(",")[0], country.split(",")[0]) for country in countries_list], widget=widgets.Select())
+    country = SelectField("Country", choices=[(country.split(",")[0], country.split(",")[0]) for country in countries_list], widget=widgets.Select())
-    newsletter = BooleanField("'I authorize MLH to send me occasional emails about relevant events, career opportunities, and community announcements.")
+    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()])
 

goathacks/registration/schools.txt

@@ -1,4 +1,4 @@
-Worcester Polytechnic Institute
+
 21st Century Cyber Charter School
 Aalto University
 Aarhus University
@@ -2198,6 +2198,7 @@ Woodbridge High School - London
 "Woodbridge High School - Woodbridge, NJ"
 "Woodbridge High School - Woodbridge, ON"
 "Woodbridge High School - Woodbridge, VA"
+Worcester Polytechnic Institute
 Worcester State University
 World Communications Charter School
 Wright State University

goathacks/templates/admin.html

@@ -14,22 +14,8 @@
 {% block app_content %}
 <div class="card text-center">
     <div class="card-body">
-
+        <h1 class="h3 mb-3 fw-normal">Registered Users</h1>
-        <div style="display:flex;flex-wrap:nowrap;align-items:center;">
+        <table id="hackers" class="table table-striped">
-            <div class="dropdown">
-                <a href="#" class="btn btn-primary dropdown-toggle"
-                            data-bs-toggle="dropdown">Search<span
-                            class="caret"></span></a>
-                <ul class="dropdown-menu">
-                    <input style="padding:5px;margin-left:10px;margin-right:10px;" type="text" id="searchbox" name="searchbox-text" placeholder="Search By Email" onkeyup="filterHackers()"/>
-                </ul>
-            </div>
-
-            <!-- TODO: get "Registered Users" properly centered -->
-            <h1 style="flex-grow:1;justify-content:center;" class="h3 mb-3 fw-normal">Registered Users</h1>
-        </div>
-
-        <table id="hackers" class="table table-striped sortable">
             <thead>
                 <tr>
                     <th>Options</th>
@@ -93,71 +79,16 @@
                     <td>{{ hacker.id }}</td>
                     <td>{{ hacker.last_login }}</td>
                     <td>{{ hacker.email }}</td>
-                    <td>
+                    <td>{{ hacker.first_name + ' ' + hacker.last_name }}</td>
-                        <div style="display: flex; justify-content: flex-start;">
+                    <td>{{ hacker.phone }}</td>
-                            <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:100px;" type="text" id="{{hacker.id}}-namebox-first" placeholder="first_name" value="{{hacker.first_name}}" onchange="updateHacker(this.id, 'first_name', this.value)"/>
-                            <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:100px;" type="text" id="{{hacker.id}}-namebox-last" placeholder="last_name" value="{{hacker.last_name}}" onchange="updateHacker(this.id, 'last_name', this.value)"/>
-                        </div>
-                    </td>
-                    <td>
-                        <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:100px;" type="text" id="{{hacker.id}}-phonebox" placeholder="phone" value="{{hacker.phone}}" onchange="updateHacker(this.id, 'phone', this.value)"/>
-                    </td>
                     <td>{{ hacker.shirt_size }}</td>
                     <td>{{ hacker.accomodations }}</td>
-                    <td>
+                    <td>{{ hacker.school }}</td>
-                        <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:75px;" type="text" id="{{hacker.id}}-schoolbox" placeholder="school" value="{{hacker.school}}" onchange="updateHacker(this.id, 'school', this.value)"/>
-                    </td>
                 </tr>
                 {% endfor %}
             </tbody>
         </table>
     </div>
 </div>
-
-<script type="text/javascript">
-    function filterHackers() {
-        //get hacker table and searchbox info
-        const input = document.getElementById("searchbox").value.toLowerCase();
-        const hackertable = document.getElementById("hackers");
-        let rows = hackertable.getElementsByTagName("tr");
-
-        //iterate over all rows
-        for(let i = 1; i < rows.length; i++) {
-            //get the email
-            const cells = rows[i].getElementsByTagName("td");
-            const emailCell = cells[6];
-
-            //if there is an email, display or dont display based on searchbox
-            if(emailCell) {
-                const emailText = emailCell.textContent.toLowerCase();
-                if(!emailText.includes(input)) {
-                    rows[i].style.display = "none";
-                }
-                else {
-                    rows[i].style.display = "";
-                }
-            }
-        }
-    }
-
-    function updateHacker(id, change_field, new_val) {
-        //tell backend to update a specific field for a hacker
-        const headers = [
-            ["Content-Type", "application/json"],
-        ];
-
-        let body = {
-            "hacker_id": id.substr(0, id.indexOf('-')),
-            "change_field": change_field,
-            "new_val": new_val,
-        }
-
-        //send the post request, and report the error if there is one
-        fetch('/admin/updateHacker', {method: 'POST', body: JSON.stringify(body), headers: headers}).catch((err) => {
-            window.alert("Error updating user - see console for details");
-            console.log(err);
-        })
-    }
-</script>
 {% endblock %}
 

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/home

@@ -1 +1 @@
-Subproject commit 261ffb2bab157162c86f60cdd4b22723565c903e
+Subproject commit db2a7a865f9b3865fa2180b1b53b1c2d2640be81

goathacks/templates/register.html

@@ -102,7 +102,7 @@ privacy policy. I further agree to the terms of both the <a
                 </div>
                 <div class="form-check mb-3">
                     {{ form.newsletter }}
-                    I authorize MLH to send me occasional emails about relevant events, career opportunities, and community announcements.
+                    Subscribe to the MLH newsletter?
                 </div>
                 {{ render_field(form.submit) }}
             </form>