merge master into stage

CodeChallenge/__init__.py

@@ -11,6 +11,7 @@
 from . import core
 from .api.eb import bp as eb_bp
 from .api.questions import bp as questions_bp
+from .api.slack import bp as slack_bp
 from .api.users import bp as users_bp
 from .api.vote import bp as vote_bp
 from .auth import jwt
@@ -62,6 +63,7 @@ def create_app(config):
     app.register_blueprint(q_cli_bp)
     app.register_blueprint(clock_cli_bp)
     app.register_blueprint(vote_bp)
+    app.register_blueprint(slack_bp)
 
     @app.errorhandler(429)
     def ratelimit_handler(e):

CodeChallenge/api/eb.py

@@ -1,5 +1,6 @@
 from hmac import compare_digest
 
+import requests
 from flask import Blueprint, request, current_app, render_template
 from flask_mail import Message
 
@@ -41,4 +42,10 @@ def worker():
 
         mail.send(msg)
 
+        webhook = current_app.config.get("SLACK_WEBHOOK")
+        if webhook is not None:
+            requests.post(webhook, json=dict(
+                text=f"*NEW RANK* {core.current_rank()}"
+            ))
+
     return "", 200

CodeChallenge/api/slack.py

@@ -0,0 +1,91 @@
+import hmac
+import re
+import time
+
+import requests
+from flask import Blueprint, request, jsonify, current_app, abort
+from sqlalchemy import func
+
+from .. import core
+from ..auth import Users
+from ..models import db
+
+bp = Blueprint("slackapi", __name__, url_prefix="/api/v1/slack")
+
+CMDRE = re.compile(r"^!([^ ]+)", re.I)
+
+
+@bp.before_request
+def slack_verify():
+    ts = request.headers.get("X-Slack-Request-Timestamp")
+    secret = bytes(current_app.config.get("SLACK_SIGNING_SECRET"), "utf8")
+    body = request.data
+
+    if abs(time.time() - int(ts)) > 60 * 5:
+        abort(401)
+
+    sig_basestring = bytes(f"v0:{ts}:", "utf8")
+    sig_basestring += body
+
+    my_sig = "v0=" + hmac.new(secret, sig_basestring, digestmod="SHA256").hexdigest()
+    slack_sig = request.headers.get("X-Slack-Signature")
+    if not hmac.compare_digest(my_sig, slack_sig):
+        abort(401)
+
+
+def post_message(channel, text):
+    rv = requests.post("https://slack.com/api/chat.postMessage",
+                       headers=dict(
+                           Authorization="Bearer " + current_app.config["SLACK_OAUTH_TOKEN"]
+                       ),
+                       json=dict(
+                           channel=channel,
+                           text=text
+                       ))
+
+    rv.raise_for_status()
+
+
+def handle_message(text, channel):
+    match = CMDRE.search(text)
+
+    if match is None:
+        return
+
+    command = match.group(1)
+
+    if command == "status":
+        rank = core.current_rank()
+        resp = f"*Current Rank:* {rank if rank != -1 else '(challenge not started)'}\n"
+        resp += f"*Max Rank:* {core.max_rank()}\n"
+        resp += f"*Next Rank:* {core.time_until_next_rank()}\n"
+        resp += f"*Total Users:* {core.user_count()}"
+
+        post_message(channel, resp)
+
+    if command == "foundus":
+        found_us = db.session.query(Users.found_us,
+                                    func.count(Users.found_us)) \
+            .group_by(Users.found_us) \
+            .order_by(Users.found_us) \
+            .all()
+
+        resp = ""
+        for row in found_us:
+            resp += f"*{row[0]}*: {row[1]}\n"
+
+        post_message(channel, resp)
+
+
+@bp.route("/event", methods=["POST"])
+def slack_event():
+    data = request.get_json()
+
+    if "challenge" in data:
+        return jsonify(challenge=data["challenge"])
+
+    event = data["event"]
+    if event["type"] == "message":
+        handle_message(event["text"], event["channel"])
+
+    return "", 200

CodeChallenge/api/users.py

@@ -1,3 +1,4 @@
+import requests
 from flask import Blueprint, jsonify, request, current_app, render_template
 from flask_jwt_extended import (create_access_token, create_refresh_token,
                                 get_current_user, get_jwt_identity,
@@ -6,6 +7,7 @@
                                 unset_jwt_cookies)
 from flask_limiter.util import get_remote_address
 from flask_mail import Message
+from sqlalchemy import func
 
 from .. import core
 from ..auth import (Users, hash_password, password_reset_token,
@@ -146,8 +148,7 @@ def register():
     name = new_u.studentfirstname or new_u.parentfirstname
     confirm_email.html = render_template("challenge_account_confirm.html",
                                          name=name,
-                                         username=new_u.username,
-                                         password=password)
+                                         username=new_u.username)
     confirm_email.extra_headers = {"List-Unsubscribe": "%unsubscribe_email%"}
 
     # welcome email
@@ -162,6 +163,18 @@ def register():
     mail.send(confirm_email)
     mail.send(welcome_email)
 
+    if "SLACK_WEBHOOK" in current_app.config and not current_app.config.get("TESTING", False):
+        regcount = db.session.query(func.count(Users.id)).scalar()
+        webhook = current_app.config.get("SLACK_WEBHOOK")
+        requests.post(webhook, json=dict(
+            text="Event: New Registration\n\n"
+                 f"*User*: {new_u.username}\n"
+                 f"*Student*: {new_u.studentfirstname} {new_u.studentlastname}\n"
+                 f"*Parent*: {new_u.parentfirstname} {new_u.parentlastname}\n"
+                 f"*How'd you find us?* {new_u.found_us}\n"
+                 f"\n*Total Registrations*: {regcount}"
+        ))
+
     return jsonify({"status": "success"})
 
 

CodeChallenge/api/vote.py

@@ -55,10 +55,15 @@ def get_contestants():
             display = f"{ans.user.studentfirstname} " \
                       f"{ans.user.studentlastname[0]}."
 
+        confirmed_votes = []
+        for v in ans.votes:
+            if v.confirmed:
+                confirmed_votes.append(v)
+
         contestants.append(dict(
             id=ans.id,
             text=ans.text,
-            numVotes=len(ans.votes),
+            numVotes=len(confirmed_votes),
             firstName=ans.user.studentfirstname,
             lastName=ans.user.studentlastname,
             username=ans.user.username,

CodeChallenge/config.py

@@ -30,6 +30,10 @@ class DefaultConfig:
     MG_PRIVATE_KEY = os.getenv("MG_PRIVATE_KEY")
     MG_LIST = "codechallenge@school.codewizardshq.com"
     WORKER_PASSWORD = os.getenv("WORKER_PASSWORD")
+    SLACK_WEBHOOK = os.getenv("SLACK_WEBHOOK")
+    SLACK_SIGNING_SECRET = os.getenv("SLACK_SIGNING_SECRET")
+    SLACK_OAUTH_TOKEN = os.getenv("SLACK_OAUTH_TOKEN")
+    SLACK_CHANNEL = os.getenv("SLACK_CHANNEL")
 
     # no trailing /
     EXTERNAL_URL = "https://challenge.codewizardshq.com"

CodeChallenge/core.py

@@ -3,6 +3,7 @@
 from flask import current_app
 from sqlalchemy import func
 
+from .auth import Users
 from .models import Question, db
 
 
@@ -68,3 +69,7 @@ def challenge_ended() -> bool:
         return True
 
     return False
+
+
+def user_count() -> int:
+    return db.session.query(func.count(Users.id)).scalar()

CodeChallenge/templates/challenge_account_confirm.html

@@ -295,7 +295,6 @@
                     <p><b>{{name}}, your account has been created.</b></p>
                     <br/>
                     <p>Login: {{username}}</p>
-                    <p>Password: {{password}}</p>
                     <br/>
                     <p>Forgot your password? <a href="https://challenge.codewizardshq.com/forgot-password">Reset your password.</a></p>
                   </td>

src/api/voting.js

@@ -1,8 +1,10 @@
 import routes from "./routes";
 import request from "./request";
 
-async function getBallot() {
-  return request(routes.voting_ballot);
+async function getBallot(page, per) {
+  return request(routes.voting_ballot, {
+    params: { page, per }
+  });
 }
 
 async function cast(answerId, email) {

src/components/MobileWarning.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="mobile-warning" v-if="show">
+    <img src="/images/logo-small.png" class="mt-6 mb-6" />
+    <h2 class="mb-3">Come back on your desktop!</h2>
+    <p class="pa-10">
+      Our Coding Challenge platform was not created for mobile phones. Please
+      visit challenge.codewizardshq.com from your desktop for the best
+      experience.
+    </p>
+    <v-btn color="button" @click="show = false">Show me anyways</v-btn>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      show: true
+    };
+  }
+};
+</script>

src/components/QuizNeedHelp.vue

@@ -9,16 +9,19 @@
         <v-card-text>
           <v-row no-gutters class="pt-3">
             <v-col
-              v-for="(icon, i) in icons"
+              v-for="icon in icons"
               :key="icon.icon"
-              :cols="i == icons.length - 1 ? 12 : 6"
+              cols="6"
               class="text-center"
             >
-              <v-btn>
+              <v-btn :href="icon.to" target="_blank">
                 <v-icon>mdi-{{ icon.icon }}</v-icon>
               </v-btn>
             </v-col>
           </v-row>
+          <a class="mt-6" href="https://github.com/codewizardshq/code-challenge"
+            >Check out the source code on GitHub!</a
+          >
         </v-card-text>
       </v-card>
     </v-dialog>
@@ -33,19 +36,21 @@ export default {
       dialog: false,
       icons: [
         {
-          icon: "twitter"
+          icon: "twitter",
+          to: "https://twitter.com/CodeWizardsHQ"
         },
         {
-          icon: "facebook"
+          icon: "facebook",
+          to: "https://www.facebook.com/events/501020200554546/"
         },
         {
-          icon: "whatsapp"
+          icon: "linkedin",
+          to: "https://www.linkedin.com/company/codewizardshq"
         },
         {
-          icon: "linkedin"
-        },
-        {
-          icon: "email"
+          icon: "email",
+          to:
+            "mailto:?subject=Join%20me%20in%20the%20CodeWizardsHQ%20Code%20Challenge!"
         }
       ]
     };

src/components/SocialPopOver.vue

@@ -19,7 +19,7 @@
             :cols="i == icons.length - 1 ? 12 : 6"
             class="text-center"
           >
-            <v-btn>
+            <v-btn :to="icon.to" target="_blank">
               <v-icon>mdi-{{ icon.icon }}</v-icon>
             </v-btn>
           </v-col>
@@ -35,19 +35,21 @@ export default {
     isOpen: false,
     icons: [
       {
-        icon: "twitter"
+        icon: "twitter",
+        to: "https://twitter.com/CodeWizardsHQ"
       },
       {
-        icon: "facebook"
+        icon: "facebook",
+        to: "https://www.facebook.com/events/501020200554546/"
       },
       {
-        icon: "whatsapp"
+        icon: "linkedin",
+        to: "https://www.linkedin.com/company/codewizardshq"
       },
       {
-        icon: "linkedin"
-      },
-      {
-        icon: "email"
+        icon: "email",
+        to:
+          "mailto:?subject=Join%20me%20in%20the%20CodeWizardsHQ%20Code%20Challenge!"
       }
     ]
   })

src/components/Toolbars/CWHQBar.vue

@@ -1,10 +1,7 @@
 <template>
   <v-toolbar class="cwhq-bar" :height="height" :max-height="height">
     <v-container>
-      <v-spacer />
-      <a href="https://username.codewizardshq.com/edit/">Student Login</a>
-      <a href="https://username.codewizardshq.com/edit/">Parent Login</a>
-      <a href="https://codewizardshq.com/students/">Student Center</a>
+      <a href="https://codewizardshq.com/challenge">Back to CodeWizardsHQ</a>
     </v-container>
   </v-toolbar>
 </template>

src/components/Toolbars/QuizBar.vue

@@ -40,10 +40,13 @@
               <v-list-item :to="{ name: 'faq' }">
                 <v-list-item-title>Check The FAQ</v-list-item-title>
               </v-list-item>
-              <v-list-item href="https://discord.gg/fDWbCj9" target="_blank">
+              <v-list-item href="https://discord.gg/HKnpzjQ" target="_blank">
                 <v-list-item-title>Get Help On Discord</v-list-item-title>
               </v-list-item>
-              <v-list-item href="https://www.facebook.com" target="_blank">
+              <v-list-item
+                href="https://www.facebook.com/events/501020200554546/"
+                target="_blank"
+              >
                 <v-list-item-title>Get Help On Facebook</v-list-item-title>
               </v-list-item>
             </v-list>

src/store/quiz.js

@@ -3,6 +3,25 @@ import { quiz } from "@/api";
 import moment from "moment";
 import Vue from "vue";
 
+moment.updateLocale("en", {
+  relativeTime: {
+    future: "in %s",
+    past: "%s ago",
+    s: "a few seconds",
+    ss: "%d seconds",
+    m: "a minute",
+    mm: "%d minutes",
+    h: "an hour",
+    hh: "%d hours",
+    d: "a day",
+    dd: "%d days",
+    M: "one month",
+    MM: "%d months",
+    y: "a year",
+    yy: "%d years"
+  }
+});
+
 const moduleName = "Quiz";
 
 function parseDateResponse(dateResponse) {