Merge branch 'voting-and-design' of https://github.com/codewizardshq/code-challenge into voting-and-design

Author: net8floz

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

tests/test_question.py

@@ -90,7 +90,7 @@ def register(client, email, username, password, firstname, lastname, studentemai
  return client.post("/api/v1/users/register", json=dict(
  username=username, parentEmail=email, password=password,
  parentFirstName=firstname, parentLastName=lastname, DOB="1994-04-13",
- studentEmail=studentemail
+ studentEmail=studentemail, studentFirstName="Sam", studentLastName="Hoffman"
  ), follow_redirects=True)
 
 
@@ -364,6 +364,11 @@ def test_vote_ballot(client_challenge_lastq):
  assert "id" in items[0]
  assert "numVotes" in items[0]
  assert "text" in items[0]
+ assert items[0]["firstName"] == "Sam"
+ assert items[0]["lastName"] == "Hoffman"
+ assert items[0]["username"] == "cwhqsam"
+ assert items[0]["display"] == "Sam H."
+
  VALID_ANSWER = items[0]["id"]