Merge branch 'master' into mailgun-add

Author: usrbinsam

CodeChallenge/config.py

@@ -75,6 +75,7 @@ class ProductionConfig(DefaultConfig):
  GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
  SHEET_ID = os.getenv("SHEET_ID")
  MG_LIST = os.getenv("MG_LIST")
+ ANSWER_ATTEMPT_LIMIT = "5 per 1 minutes"
 
 
 class DevelopmentConfig(ProductionConfig):

CodeChallenge/core.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone, timedelta, time
+from datetime import datetime, timezone, timedelta
 
 from flask import current_app
 from sqlalchemy import func
@@ -20,7 +20,8 @@ def day_number() -> int:
  return -1
 
  delta = now - start
- return 1 if delta.days == 0 else delta.days
+
+ return delta.days + 1
 
 
 def current_rank() -> int:
@@ -42,16 +43,8 @@ def time_until_next_rank() -> str:
  epoch = int(current_app.config["CODE_CHALLENGE_START"])
  start = datetime.fromtimestamp(epoch, timezone.utc)
  now = datetime.now(timezone.utc)
-
- if start > now:
- diff = datetime.combine(start, time.min, now.tzinfo) - now
- return str(diff)
-
- tomorrow = now + timedelta(days=1)
-
- diff = datetime.combine(tomorrow, time.min, now.tzinfo) - now
-
- return str(diff)
+ next_date = start + timedelta(days=day_number())
+ return str(next_date - now)
 
 
 def friendly_starts_on() -> str:

src/api/quiz.js

@@ -23,7 +23,7 @@ async function submit(answer) {
 }
 
 async function getLeaderboard() {
- return request(routes.questionsapi_leaderboard, { params: { per: 1000 } });
+ return request(routes.questionsapi_leaderboard, { params: { per: 1500 } });
 }
 
 async function submitFinal(answer, language, checkOnly) {

src/components/Toolbars/LeaderboardBar.vue

@@ -1,5 +1,12 @@
 <template>
- <v-toolbar elevation="0" color="white" :height="height" :min-height="height" :max-height="height" class="leaderboard-bar">
+ <v-toolbar
+ elevation="0"
+ color="white"
+ :height="height"
+ :min-height="height"
+ :max-height="height"
+ class="leaderboard-bar"
+ >
  <div class="rotated-text">
  LEADER
  <br />BOARD
@@ -16,13 +23,13 @@
 </template>
 
 <script>
-import MarqueeText from 'vue-marquee-text-component';
-import * as api from '@/api';
-import { shuffle } from '@/util';
+import MarqueeText from "vue-marquee-text-component";
+import * as api from "@/api";
+import { shuffle } from "@/util";
 
 export default {
  components: {
- MarqueeText,
+ MarqueeText
  },
  async mounted() {
  const leaders = (await api.quiz.getLeaderboard()).items;
@@ -35,7 +42,7 @@ export default {
  for (const leader of leaders) {
  this.items.push({
  username: leader[0],
- rank: leader[1],
+ rank: leader[1]
  });
  }
  }
@@ -49,8 +56,8 @@ export default {
  data() {
  return {
  height: 50,
- items: [],
+ items: []
  };
- },
+ }
 };
 </script>

src/plugins/router.js

@@ -96,6 +96,12 @@ const routes = [
  name: "admin",
  component: () => import("@/views/Accounts/Admin"),
  meta: { auth: true }
+ },
+ {
+ path: "super-secret-rank-page",
+ name: "super-secret-rank-page",
+ component: () => import("@/views/Accounts/SuperSecretRank"),
+ meta: { auth: true }
  }
  ]
  },

src/views/Accounts/Register/index.vue

@@ -259,7 +259,7 @@ export default {
  "15 years old",
  "16 years old",
  "17 years old",
- "18 years old or older"
+ "18 years old"
  ],
  value: "How old is the student?",
  rules: [

src/views/Accounts/SuperSecretRank.vue

@@ -0,0 +1,52 @@
+<template>
+ <v-container>
+ <page-card>
+ <template #title>
+ Shhh it's a secret page
+ <small style="position: absolute; right:12px;top:20px"
+ >showing {{ leaders.length }} total entries</small
+ >
+ </template>
+ <v-simple-table>
+ <thead>
+ <tr>
+ <td>Username</td>
+ <td>Rank</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="item in leaders" :key="item.username">
+ <td>
+ {{ item[0] }}
+ </td>
+ <td>
+ {{ item[1] }}
+ </td>
+ </tr>
+ </tbody>
+ </v-simple-table>
+ </page-card>
+ </v-container>
+</template>
+
+<script>
+import * as api from "@/api";
+import PageCard from "@/components/PageCard.vue";
+export default {
+ components: {
+ PageCard
+ },
+ name: "super-secret-rank",
+ data() {
+ return {
+ leaders: []
+ };
+ },
+
+ async mounted() {
+ this.leaders = (await api.quiz.getLeaderboard()).items.sort((a, b) => {
+ return a[1] < b[1];
+ });
+ }
+};
+</script>

src/views/Quiz/QuizAnswer.vue

@@ -215,7 +215,7 @@ export default {
  "Snackbar/showError",
  "That answer was not correct"
  );
- this.fields.answer.errorMessages = ["That answer was not correct"];
+ this.fields.answer.errorMessages = ["Your answer was not correct"];
  }
  } catch (err) {
  if (err.status === 429) {

src/views/Quiz/QuizIntro.vue

@@ -17,7 +17,7 @@
  </p>
  <p class="text-center">
  <v-btn color="secondary darken-2" @click="onClick" x-large
- >Okay!</v-btn
+ >OK!</v-btn
  >
  </p>
  </template>

tests/test_question.py

@@ -11,8 +11,8 @@
 NOW = datetime.now(timezone.utc)
 
 CC_CLOSED = (NOW - timedelta(days=5)).timestamp()
-CC_2D_PRIOR = (NOW - timedelta(days=2)).timestamp()
-CC_4D_PRIOR = (NOW - timedelta(days=4)).timestamp()
+CC_2D_PRIOR = (NOW - timedelta(days=1)).timestamp()
+CC_4D_PRIOR = (NOW - timedelta(days=3)).timestamp()
 CC_2D_FUTURE = (NOW + timedelta(days=2)).timestamp()