Merge branch 'master' into hotfix-flask-q-sync

Author: usrbinsam

CodeChallenge/__init__.py

@@ -1,7 +1,8 @@
 import os
+import re
 
 import sentry_sdk
-from flask import Flask, jsonify, make_response, send_from_directory, redirect
+from flask import Flask, jsonify, make_response, send_from_directory
 from flask_cors import CORS
 from sentry_sdk.integrations.flask import FlaskIntegration
 from werkzeug.middleware.proxy_fix import ProxyFix
@@ -22,6 +23,7 @@
 from .manage import add_question, del_question  # NoQA
 from .models import db, init_db  # NoQA
 
+STATIC_FILES = re.compile(r"\.(ico|png|xml|json)$")
 
 # Globally accessible libraries
 
@@ -93,24 +95,12 @@ def send_images(path):
     def send_assets(path):
         return send_from_directory("assets", path)
 
-    @app.route("/landing", defaults={"path": ""})
-    @app.route("/landing/<path:path>")
-    def send_landing(path):
-
-        # if core.current_rank() != -1:
-        #    return redirect("/")
-
-        if path:
-            return send_from_directory("../landing/", path)
-        return send_from_directory("../landing/", "index.html")
-
     @app.route("/", defaults={"path": ""})
     @app.route("/<path:path>")
     def catch_all(path):
 
-        # show landing page
-        if core.current_rank() == -1 and (not path or path == "home"):
-            return redirect("/landing")
+        if STATIC_FILES.search(path):
+            return send_from_directory(app.config["DIST_DIR"], path)
 
         return send_from_directory(app.config["DIST_DIR"], "index.html")
 

CodeChallenge/api/questions.py

@@ -20,7 +20,7 @@ def json_error(reason, status=400):
 
 @bp.before_request
 def end_code_challenge():
-    if core.challenge_ended():
+    if core.challenge_ended() and request.path != "/api/v1/questions/leaderboard":
         r = jsonify(status="error",
                     reason="code challenge has ended")
         r.status_code = 403

CodeChallenge/api/vote.py

@@ -48,10 +48,21 @@ def get_contestants():
 
     contestants = []
     for ans in p.items:  # type: Answer
+
+        display = None
+        if ans.user.studentfirstname \
+                and ans.user.studentlastname:
+            display = f"{ans.user.studentfirstname} " \
+                      f"{ans.user.studentlastname[0]}."
+
         contestants.append(dict(
             id=ans.id,
             text=ans.text,
             numVotes=len(ans.votes),
+            firstName=ans.user.studentfirstname,
+            lastName=ans.user.studentlastname,
+            username=ans.user.username,
+            display=display
         ))
 
     return jsonify(

CodeChallenge/config.py

@@ -84,4 +84,4 @@ class DevelopmentConfig(ProductionConfig):
 
     @property
     def DIST_DIR(self):
-        return os.path.join(self.ROOT_DIR, "public")
+        return os.path.join(self.ROOT_DIR, "dist")

CodeChallenge/models.py

@@ -36,6 +36,7 @@ class Answer(db.Model):
     text = db.Column(db.String(2000))
     correct = db.Column(db.Boolean)
     question = db.relationship("Question", lazy=True, uselist=False)
+    user = db.relationship("Users", lazy=True, uselist=False)
     votes = db.relationship("Vote", cascade="all,delete",
                             lazy=True, uselist=True)
 

package.json

@@ -31,6 +31,7 @@
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-vue": "^5.0.0",
     "js-yaml": "^3.13.1",
+    "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.12.0",
     "prettier": "^1.18.2",
     "sass": "^1.19.0",