From e01bccd732ebbdc2e9571d7a91b0df5cdd677883 Mon Sep 17 00:00:00 2001
From: Samuel Hoffman <samuelhoffman2@gmail.com>
Date: Wed, 4 Mar 2020 16:58:09 -0500
Subject: [PATCH 1/4] change Discord invite so it comes from a more generic
 username

---
 src/components/Toolbars/QuizBar.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Toolbars/QuizBar.vue b/src/components/Toolbars/QuizBar.vue
index e3174df..03bc941 100644
--- a/src/components/Toolbars/QuizBar.vue
+++ b/src/components/Toolbars/QuizBar.vue
@@ -40,7 +40,7 @@
               <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/HKnpzjQ" target="_blank">
+              <v-list-item href="https://discord.gg/NuKfKZ8" target="_blank">
                 <v-list-item-title>Get Help On Discord</v-list-item-title>
               </v-list-item>
               <v-list-item
@@ -66,9 +66,9 @@
 </template>
 
 <script>
-import { User, Quiz } from "@/store";
+  import {Quiz, User} from "@/store";
 
-export default {
+  export default {
   name: "quizBar",
   computed: {
     ...User.mapState(),

From da7332bc1c6f03b49c24cb36635e7b6d3ba45236 Mon Sep 17 00:00:00 2001
From: net8floz <net8floz@gmail.com>
Date: Thu, 5 Mar 2020 23:52:37 -0800
Subject: [PATCH 2/4] fixes initials, sends register to voting

---
 src/api/voting.js               |  37 ++++++-
 src/plugins/router.js           | 177 ++++++++++++++------------------
 src/views/Voting/Ballot.vue     |  28 ++---
 src/views/Voting/BallotCard.vue |  24 +----
 src/views/Voting/CodeModal.vue  |   5 +-
 5 files changed, 126 insertions(+), 145 deletions(-)

diff --git a/src/api/voting.js b/src/api/voting.js
index b2b0cfd..5b2c562 100644
--- a/src/api/voting.js
+++ b/src/api/voting.js
@@ -1,10 +1,41 @@
-import routes from "./routes";
-import request from "./request";
+import routes from './routes';
+import request from './request';
+
+function lastInitial(item) {
+  if (item.lastName) {
+    return item.lastName[0];
+  }
+
+  const split = item.username.split(' ');
+  return split.length >= 2 ? split[1] : '';
+}
+
+function firstInitial(item) {
+  if (item.firstName) {
+    return item.firstName[0];
+  }
+  if (item.display) {
+    return item.display[0];
+  }
+
+  return item.username.split(' ')[0];
+}
+
+function initials(item) {
+  return `${firstInitial(item)}${lastInitial(item)}`;
+}
 
 async function getBallot(page, per) {
-  return request(routes.voting_ballot, {
+  const result = await request(routes.voting_ballot, {
     params: { page, per }
   });
+
+  if (result.items) {
+    result.items = result.items.map(item => {
+      return { ...item, ...{ initials: initials(item) } };
+    });
+  }
+  return result;
 }
 
 async function cast(answerId, email) {
diff --git a/src/plugins/router.js b/src/plugins/router.js
index a0cbd85..df8c3a3 100644
--- a/src/plugins/router.js
+++ b/src/plugins/router.js
@@ -1,7 +1,7 @@
-import Vue from "vue";
-import VueRouter from "vue-router";
-import { auth } from "@/api";
-import store from "@/store";
+import Vue from 'vue';
+import VueRouter from 'vue-router';
+import { auth } from '@/api';
+import store from '@/store';
 
 Vue.use(VueRouter);
 
@@ -18,220 +18,197 @@ function isChallengeClosed() {
 }
 
 async function logout() {
-  await store.dispatch("Quiz/reset");
+  await store.dispatch('Quiz/reset');
   await auth.logout();
 }
 
 const routes = [
   {
     // basically a dynamic home page
-    path: "/",
-    name: "redirect",
+    path: '/',
+    name: 'redirect',
     beforeEnter(to, from, next) {
       if (isChallengeOpen() || isChallengePending()) {
-        next({ name: "quiz" });
+        next({ name: 'quiz' });
         return;
       }
 
       if (isChallengeClosed()) {
-        next({ name: "voting" });
+        next({ name: 'voting' });
         return;
       }
     }
   },
   {
     // public routes
-    path: "/",
-    component: () => import("@/views/Public/App"),
+    path: '/',
+    component: () => import('@/views/Public/App'),
     children: [
       {
-        path: "frequently-asked-questions",
-        name: "faq",
-        component: () => import("@/views/Public/FAQ")
+        path: 'frequently-asked-questions',
+        name: 'faq',
+        component: () => import('@/views/Public/FAQ')
       }
     ]
   },
   // FOR EXTERNAL IFRAME
   {
-    path: "/iframe/leaderboard",
-    name: "iframe-leaderboard",
-    component: () => import("@/views/IFrame/Leaderboard")
+    path: '/iframe/leaderboard',
+    name: 'iframe-leaderboard',
+    component: () => import('@/views/IFrame/Leaderboard')
   },
   {
     // account routes
-    path: "/",
-    component: () => import("@/views/Public/App"),
+    path: '/',
+    component: () => import('@/views/Public/App'),
     children: [
       {
-        path: "login",
-        name: "login",
-        component: () => import("@/views/Accounts/Login"),
+        path: 'login',
+        name: 'login',
+        component: () => import('@/views/Accounts/Login'),
         meta: { anon: true }
       },
       {
-        path: "forgot-password",
-        name: "forgot-password",
-        component: () => import("@/views/Accounts/ForgotPassword")
+        path: 'forgot-password',
+        name: 'forgot-password',
+        component: () => import('@/views/Accounts/ForgotPassword')
       },
       {
-        path: "reset-password/:token",
-        name: "reset-password",
-        component: () => import("@/views/Accounts/ResetPassword")
+        path: 'reset-password/:token',
+        name: 'reset-password',
+        component: () => import('@/views/Accounts/ResetPassword')
       },
       {
-        path: "create-account",
-        name: "register",
-        component: () => import("@/views/Accounts/Register"),
-        meta: { anon: true }
+        path: 'create-account',
+        name: 'register',
+        component: () => import('@/views/Accounts/Register'),
+        meta: { anon: true, challengeOpenOrPending: true }
       },
       {
-        path: "logout",
-        name: "logout",
-        beforeEnter: (to, from, next) =>
-          logout().then(() => next({ name: "login" })),
+        path: 'logout',
+        name: 'logout',
+        beforeEnter: (to, from, next) => logout().then(() => next({ name: 'login' })),
         meta: { auth: true }
       },
       {
-        path: "admin",
-        name: "admin",
-        component: () => import("@/views/Accounts/Admin"),
+        path: 'admin',
+        name: 'admin',
+        component: () => import('@/views/Accounts/Admin'),
         meta: { auth: true }
       }
     ]
   },
   {
     // voting routes
-    path: "/",
-    component: () => import("@/views/Voting/App"),
+    path: '/',
+    component: () => import('@/views/Voting/App'),
     meta: { challengeOver: true },
     children: [
       {
-        path: "voting",
-        name: "voting",
-        component: () => import("@/views/Voting/Ballot")
+        path: 'voting',
+        name: 'voting',
+        component: () => import('@/views/Voting/Ballot')
       },
       {
-        path: "vote-confirmation",
-        name: "voting-confirmation",
-        component: () => import("@/views/Voting/Confirm")
+        path: 'vote-confirmation',
+        name: 'voting-confirmation',
+        component: () => import('@/views/Voting/Confirm')
       }
     ]
   },
   {
     // quiz routes
-    path: "/",
-    component: () => import("@/views/Public/App"),
+    path: '/',
+    component: () => import('@/views/Public/App'),
     meta: { secured: true, challengeOpenOrPending: true },
     children: [
       {
-        path: "quiz",
-        name: "quiz",
+        path: 'quiz',
+        name: 'quiz',
         component: async () => {
           // CHALLENGE HAS NOT STARTED
           if (!isChallengeOpen()) {
-            return import("@/views/Quiz/QuizCountdown");
+            return import('@/views/Quiz/QuizCountdown');
           }
 
           // USER HAS FINISHED QUIZ
           if (store.state.Quiz.maxRank === store.state.User.rank - 1) {
-            return import("@/views/Quiz/QuizFinished");
+            return import('@/views/Quiz/QuizFinished');
           }
 
           // MUST WAIT FOR NEXT QUESTION
           if (store.state.Quiz.awaitNextQuestion) {
-            return import("@/views/Quiz/QuizCountdown");
+            return import('@/views/Quiz/QuizCountdown');
           }
 
           // SHOW THE LAST QUESTION
           if (store.state.Quiz.isLastQuestion) {
-            return import("@/views/Quiz/QuizFinalQuestion");
+            return import('@/views/Quiz/QuizFinalQuestion');
           }
 
           // NORMAL QUIZ MODE
-          return import("@/views/Quiz/Quiz");
+          return import('@/views/Quiz/Quiz');
         },
         beforeEnter(from, to, next) {
           // USER MUST SEE INTRO VIDEO
-          if (
-            isChallengeOpen() &&
-            !store.state.Quiz.hasSeenIntro &&
-            store.state.User.rank == 1
-          ) {
-            next({ name: "quiz-intro" });
+          if (isChallengeOpen() && !store.state.Quiz.hasSeenIntro && store.state.User.rank == 1) {
+            next({ name: 'quiz-intro' });
             return;
           }
           next();
         }
       },
       {
-        path: "/quiz/intro",
-        name: "quiz-intro",
-        component: () => import("@/views/Quiz/QuizIntro")
+        path: '/quiz/intro',
+        name: 'quiz-intro',
+        component: () => import('@/views/Quiz/QuizIntro')
       }
     ]
   },
   {
-    path: "*",
-    name: "wildcard",
-    redirect: { name: "redirect" }
+    path: '*',
+    name: 'wildcard',
+    redirect: { name: 'redirect' }
   }
 ];
 
 const router = new VueRouter({
-  mode: "history",
+  mode: 'history',
   routes
 });
 
 router.beforeEach(async (to, from, next) => {
   const requireAuth = to.matched.some(record => record.meta.secured);
   const requireAnon = to.matched.some(record => record.meta.anon);
-  const requireChallengePending = to.matched.some(
-    record => record.meta.challengePending
-  );
-  const requireChallengeOpen = to.matched.some(
-    record => record.meta.challengeOpen
-  );
-  const requireChallengeClosed = to.matched.some(
-    record => record.meta.challengeOver
-  );
-  const requireChallengeOpenPending = to.matched.some(
-    record => record.meta.challengeOpenOrPending
-  );
-
-  if (
-    requireChallengePending ||
-    requireChallengeOpen ||
-    requireChallengeClosed ||
-    requireChallengeOpenPending
-  ) {
+  const requireChallengePending = to.matched.some(record => record.meta.challengePending);
+  const requireChallengeOpen = to.matched.some(record => record.meta.challengeOpen);
+  const requireChallengeClosed = to.matched.some(record => record.meta.challengeOver);
+  const requireChallengeOpenPending = to.matched.some(record => record.meta.challengeOpenOrPending);
+  if (requireChallengePending || requireChallengeOpen || requireChallengeClosed || requireChallengeOpenPending) {
     try {
-      await store.dispatch("Quiz/refresh");
+      await store.dispatch('Quiz/refresh');
 
       const challengeIsClosed = isChallengeClosed();
       const challengeIsPending = isChallengePending();
       const challengeIsOpen = isChallengeOpen();
 
       if (!challengeIsClosed && requireChallengeClosed) {
-        next({ name: "redirect" });
+        next({ name: 'redirect' });
         return;
       }
 
       if (!challengeIsOpen && requireChallengeOpen) {
-        next({ name: "redirect" });
+        next({ name: 'redirect' });
         return;
       }
 
       if (!challengeIsPending && requireChallengePending) {
-        next({ name: "redirect" });
+        next({ name: 'redirect' });
         return;
       }
 
-      if (
-        !challengeIsOpen &&
-        !challengeIsPending &&
-        requireChallengeOpenPending
-      ) {
-        next({ name: "redirect" });
+      if (!challengeIsOpen && !challengeIsPending && requireChallengeOpenPending) {
+        next({ name: 'redirect' });
         return;
       }
     } catch (err) {
@@ -243,12 +220,12 @@ router.beforeEach(async (to, from, next) => {
     const isAuthenticated = !!auth.currentUser().auth;
 
     if (!isAuthenticated && requireAuth) {
-      next({ name: "register" });
+      next({ name: 'register' });
       return;
     }
 
     if (isAuthenticated && requireAnon) {
-      next({ name: "redirect" });
+      next({ name: 'redirect' });
       return;
     }
   }
diff --git a/src/views/Voting/Ballot.vue b/src/views/Voting/Ballot.vue
index 4b69f6a..3eea5b9 100644
--- a/src/views/Voting/Ballot.vue
+++ b/src/views/Voting/Ballot.vue
@@ -9,25 +9,14 @@
     </v-row>
     <v-row justify="center" v-if="isLoading">
       <v-col class="text-center">
-        <v-progress-circular
-          class="mt-6"
-          color="cwhqBlue"
-          size="100"
-          width="10"
-          indeterminate
-        />
+        <v-progress-circular class="mt-6" color="cwhqBlue" size="100" width="10" indeterminate />
         <h2 class="mt-6">
           Loading Results <small><br />Please Wait</small>
         </h2>
       </v-col>
     </v-row>
     <v-row justify="center" v-else>
-      <ballot-card
-        v-for="(item, i) in items"
-        :key="i"
-        v-bind="item"
-        @click="showCode(item)"
-      />
+      <ballot-card v-for="(item, i) in items" :key="i" v-bind="item" @click="showCode(item)" />
     </v-row>
     <v-row justify="center" v-if="totalPages > 1">
       <v-pagination v-model="page" :length="totalPages" circle></v-pagination>
@@ -37,10 +26,10 @@
 </template>
 
 <script>
-import Vue from "vue";
-import { voting } from "@/api";
-import BallotCard from "./BallotCard";
-import CodeModal from "./CodeModal";
+import Vue from 'vue';
+import { voting } from '@/api';
+import BallotCard from './BallotCard';
+import CodeModal from './CodeModal';
 
 export default {
   components: {
@@ -76,9 +65,8 @@ export default {
         for (const [key, value] of Object.entries(results)) {
           Vue.set(this, key, value);
         }
-        // console.log(results);
       } catch (err) {
-        this.$router.push({ name: "redirect" });
+        this.$router.push({ name: 'redirect' });
       }
       this.isLoading = false;
     }
@@ -98,7 +86,7 @@ export default {
 h2 {
   text-align: center;
   color: #0d1d41;
-  font-family: "Barlow", sans-serif;
+  font-family: 'Barlow', sans-serif;
   font-weight: bold;
   margin-bottom: 12px;
 }
diff --git a/src/views/Voting/BallotCard.vue b/src/views/Voting/BallotCard.vue
index 1b807cf..9210424 100644
--- a/src/views/Voting/BallotCard.vue
+++ b/src/views/Voting/BallotCard.vue
@@ -1,16 +1,9 @@
 <template>
-  <v-card
-    class="ballot ballot-card"
-    light
-    elevation="0"
-    @click="$emit('click')"
-  >
+  <v-card class="ballot ballot-card" light elevation="0" @click="$emit('click')">
     <div class="circle">
-      KA
-    </div>
-    <div class="vote-count">
-      {{ numVotes }} {{ numVotes.length == 1 ? "vote" : "votes" }}
+      {{ initials }}
     </div>
+    <div class="vote-count">{{ numVotes }} {{ numVotes.length == 1 ? 'vote' : 'votes' }}</div>
 
     <v-btn elevation="0" color="cwhqBlue" block>See Code</v-btn>
     <v-btn elevation="0" color="primary" block>Vote</v-btn>
@@ -19,15 +12,6 @@
 
 <script>
 export default {
-  props: [
-    "display",
-    "firstName",
-    "id",
-    "lastName",
-    "numVotes",
-    "text",
-    "username",
-    "value"
-  ]
+  props: ['display', 'firstName', 'id', 'lastName', 'numVotes', 'text', 'username', 'value', 'initials']
 };
 </script>
diff --git a/src/views/Voting/CodeModal.vue b/src/views/Voting/CodeModal.vue
index c074c0b..b96ff6d 100644
--- a/src/views/Voting/CodeModal.vue
+++ b/src/views/Voting/CodeModal.vue
@@ -11,7 +11,7 @@
         <v-row class="main-row" no-gutters>
           <v-col cols="3" sm="12" md="3" class="left">
             <div class="circle">
-              KA
+              {{ initials }}
             </div>
             <hr />
             <v-form lazy-validation @submit.prevent="submit">
@@ -106,7 +106,8 @@ export default {
     "numVotes",
     "text",
     "username",
-    "value"
+    "value",
+    "initials"
   ],
   watch: {
     isOpen() {

From ddca4196e7cf41fe8349c37158fc072a7228ff14 Mon Sep 17 00:00:00 2001
From: net8floz <net8floz@gmail.com>
Date: Thu, 5 Mar 2020 23:52:54 -0800
Subject: [PATCH 3/4] linter

---
 src/api/voting.js                   |  10 +-
 src/components/QuizNeedHelp.vue     |   6 +-
 src/components/Toolbars/QuizBar.vue |   4 +-
 src/plugins/router.js               | 174 ++++++++++++++++------------
 src/views/Quiz/QuizCountdown.vue    |   8 +-
 src/views/Voting/Ballot.vue         |  27 +++--
 src/views/Voting/BallotCard.vue     |  23 +++-
 7 files changed, 152 insertions(+), 100 deletions(-)

diff --git a/src/api/voting.js b/src/api/voting.js
index 5b2c562..b789de1 100644
--- a/src/api/voting.js
+++ b/src/api/voting.js
@@ -1,13 +1,13 @@
-import routes from './routes';
-import request from './request';
+import routes from "./routes";
+import request from "./request";
 
 function lastInitial(item) {
   if (item.lastName) {
     return item.lastName[0];
   }
 
-  const split = item.username.split(' ');
-  return split.length >= 2 ? split[1] : '';
+  const split = item.username.split(" ");
+  return split.length >= 2 ? split[1] : "";
 }
 
 function firstInitial(item) {
@@ -18,7 +18,7 @@ function firstInitial(item) {
     return item.display[0];
   }
 
-  return item.username.split(' ')[0];
+  return item.username.split(" ")[0];
 }
 
 function initials(item) {
diff --git a/src/components/QuizNeedHelp.vue b/src/components/QuizNeedHelp.vue
index 711aa2b..e83d53f 100644
--- a/src/components/QuizNeedHelp.vue
+++ b/src/components/QuizNeedHelp.vue
@@ -37,11 +37,13 @@ export default {
       icons: [
         {
           icon: "twitter",
-          to: "https://twitter.com/intent/tweet?text=The%20Dragon%20Quest%20%E2%80%93%20Code%20Challenge&url=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&original_referer="
+          to:
+            "https://twitter.com/intent/tweet?text=The%20Dragon%20Quest%20%E2%80%93%20Code%20Challenge&url=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&original_referer="
         },
         {
           icon: "facebook",
-          to: "https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&amp;src=sdkpreparse"
+          to:
+            "https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fcodewizardshq.com%2Fchallenge%2F&amp;src=sdkpreparse"
         },
         {
           icon: "linkedin",
diff --git a/src/components/Toolbars/QuizBar.vue b/src/components/Toolbars/QuizBar.vue
index 03bc941..b48a550 100644
--- a/src/components/Toolbars/QuizBar.vue
+++ b/src/components/Toolbars/QuizBar.vue
@@ -66,9 +66,9 @@
 </template>
 
 <script>
-  import {Quiz, User} from "@/store";
+import { Quiz, User } from "@/store";
 
-  export default {
+export default {
   name: "quizBar",
   computed: {
     ...User.mapState(),
diff --git a/src/plugins/router.js b/src/plugins/router.js
index df8c3a3..fde4167 100644
--- a/src/plugins/router.js
+++ b/src/plugins/router.js
@@ -1,7 +1,7 @@
-import Vue from 'vue';
-import VueRouter from 'vue-router';
-import { auth } from '@/api';
-import store from '@/store';
+import Vue from "vue";
+import VueRouter from "vue-router";
+import { auth } from "@/api";
+import store from "@/store";
 
 Vue.use(VueRouter);
 
@@ -18,197 +18,219 @@ function isChallengeClosed() {
 }
 
 async function logout() {
-  await store.dispatch('Quiz/reset');
+  await store.dispatch("Quiz/reset");
   await auth.logout();
 }
 
 const routes = [
   {
     // basically a dynamic home page
-    path: '/',
-    name: 'redirect',
+    path: "/",
+    name: "redirect",
     beforeEnter(to, from, next) {
       if (isChallengeOpen() || isChallengePending()) {
-        next({ name: 'quiz' });
+        next({ name: "quiz" });
         return;
       }
 
       if (isChallengeClosed()) {
-        next({ name: 'voting' });
+        next({ name: "voting" });
         return;
       }
     }
   },
   {
     // public routes
-    path: '/',
-    component: () => import('@/views/Public/App'),
+    path: "/",
+    component: () => import("@/views/Public/App"),
     children: [
       {
-        path: 'frequently-asked-questions',
-        name: 'faq',
-        component: () => import('@/views/Public/FAQ')
+        path: "frequently-asked-questions",
+        name: "faq",
+        component: () => import("@/views/Public/FAQ")
       }
     ]
   },
   // FOR EXTERNAL IFRAME
   {
-    path: '/iframe/leaderboard',
-    name: 'iframe-leaderboard',
-    component: () => import('@/views/IFrame/Leaderboard')
+    path: "/iframe/leaderboard",
+    name: "iframe-leaderboard",
+    component: () => import("@/views/IFrame/Leaderboard")
   },
   {
     // account routes
-    path: '/',
-    component: () => import('@/views/Public/App'),
+    path: "/",
+    component: () => import("@/views/Public/App"),
     children: [
       {
-        path: 'login',
-        name: 'login',
-        component: () => import('@/views/Accounts/Login'),
+        path: "login",
+        name: "login",
+        component: () => import("@/views/Accounts/Login"),
         meta: { anon: true }
       },
       {
-        path: 'forgot-password',
-        name: 'forgot-password',
-        component: () => import('@/views/Accounts/ForgotPassword')
+        path: "forgot-password",
+        name: "forgot-password",
+        component: () => import("@/views/Accounts/ForgotPassword")
       },
       {
-        path: 'reset-password/:token',
-        name: 'reset-password',
-        component: () => import('@/views/Accounts/ResetPassword')
+        path: "reset-password/:token",
+        name: "reset-password",
+        component: () => import("@/views/Accounts/ResetPassword")
       },
       {
-        path: 'create-account',
-        name: 'register',
-        component: () => import('@/views/Accounts/Register'),
+        path: "create-account",
+        name: "register",
+        component: () => import("@/views/Accounts/Register"),
         meta: { anon: true, challengeOpenOrPending: true }
       },
       {
-        path: 'logout',
-        name: 'logout',
-        beforeEnter: (to, from, next) => logout().then(() => next({ name: 'login' })),
+        path: "logout",
+        name: "logout",
+        beforeEnter: (to, from, next) =>
+          logout().then(() => next({ name: "login" })),
         meta: { auth: true }
       },
       {
-        path: 'admin',
-        name: 'admin',
-        component: () => import('@/views/Accounts/Admin'),
+        path: "admin",
+        name: "admin",
+        component: () => import("@/views/Accounts/Admin"),
         meta: { auth: true }
       }
     ]
   },
   {
     // voting routes
-    path: '/',
-    component: () => import('@/views/Voting/App'),
+    path: "/",
+    component: () => import("@/views/Voting/App"),
     meta: { challengeOver: true },
     children: [
       {
-        path: 'voting',
-        name: 'voting',
-        component: () => import('@/views/Voting/Ballot')
+        path: "voting",
+        name: "voting",
+        component: () => import("@/views/Voting/Ballot")
       },
       {
-        path: 'vote-confirmation',
-        name: 'voting-confirmation',
-        component: () => import('@/views/Voting/Confirm')
+        path: "vote-confirmation",
+        name: "voting-confirmation",
+        component: () => import("@/views/Voting/Confirm")
       }
     ]
   },
   {
     // quiz routes
-    path: '/',
-    component: () => import('@/views/Public/App'),
+    path: "/",
+    component: () => import("@/views/Public/App"),
     meta: { secured: true, challengeOpenOrPending: true },
     children: [
       {
-        path: 'quiz',
-        name: 'quiz',
+        path: "quiz",
+        name: "quiz",
         component: async () => {
           // CHALLENGE HAS NOT STARTED
           if (!isChallengeOpen()) {
-            return import('@/views/Quiz/QuizCountdown');
+            return import("@/views/Quiz/QuizCountdown");
           }
 
           // USER HAS FINISHED QUIZ
           if (store.state.Quiz.maxRank === store.state.User.rank - 1) {
-            return import('@/views/Quiz/QuizFinished');
+            return import("@/views/Quiz/QuizFinished");
           }
 
           // MUST WAIT FOR NEXT QUESTION
           if (store.state.Quiz.awaitNextQuestion) {
-            return import('@/views/Quiz/QuizCountdown');
+            return import("@/views/Quiz/QuizCountdown");
           }
 
           // SHOW THE LAST QUESTION
           if (store.state.Quiz.isLastQuestion) {
-            return import('@/views/Quiz/QuizFinalQuestion');
+            return import("@/views/Quiz/QuizFinalQuestion");
           }
 
           // NORMAL QUIZ MODE
-          return import('@/views/Quiz/Quiz');
+          return import("@/views/Quiz/Quiz");
         },
         beforeEnter(from, to, next) {
           // USER MUST SEE INTRO VIDEO
-          if (isChallengeOpen() && !store.state.Quiz.hasSeenIntro && store.state.User.rank == 1) {
-            next({ name: 'quiz-intro' });
+          if (
+            isChallengeOpen() &&
+            !store.state.Quiz.hasSeenIntro &&
+            store.state.User.rank == 1
+          ) {
+            next({ name: "quiz-intro" });
             return;
           }
           next();
         }
       },
       {
-        path: '/quiz/intro',
-        name: 'quiz-intro',
-        component: () => import('@/views/Quiz/QuizIntro')
+        path: "/quiz/intro",
+        name: "quiz-intro",
+        component: () => import("@/views/Quiz/QuizIntro")
       }
     ]
   },
   {
-    path: '*',
-    name: 'wildcard',
-    redirect: { name: 'redirect' }
+    path: "*",
+    name: "wildcard",
+    redirect: { name: "redirect" }
   }
 ];
 
 const router = new VueRouter({
-  mode: 'history',
+  mode: "history",
   routes
 });
 
 router.beforeEach(async (to, from, next) => {
   const requireAuth = to.matched.some(record => record.meta.secured);
   const requireAnon = to.matched.some(record => record.meta.anon);
-  const requireChallengePending = to.matched.some(record => record.meta.challengePending);
-  const requireChallengeOpen = to.matched.some(record => record.meta.challengeOpen);
-  const requireChallengeClosed = to.matched.some(record => record.meta.challengeOver);
-  const requireChallengeOpenPending = to.matched.some(record => record.meta.challengeOpenOrPending);
-  if (requireChallengePending || requireChallengeOpen || requireChallengeClosed || requireChallengeOpenPending) {
+  const requireChallengePending = to.matched.some(
+    record => record.meta.challengePending
+  );
+  const requireChallengeOpen = to.matched.some(
+    record => record.meta.challengeOpen
+  );
+  const requireChallengeClosed = to.matched.some(
+    record => record.meta.challengeOver
+  );
+  const requireChallengeOpenPending = to.matched.some(
+    record => record.meta.challengeOpenOrPending
+  );
+  if (
+    requireChallengePending ||
+    requireChallengeOpen ||
+    requireChallengeClosed ||
+    requireChallengeOpenPending
+  ) {
     try {
-      await store.dispatch('Quiz/refresh');
+      await store.dispatch("Quiz/refresh");
 
       const challengeIsClosed = isChallengeClosed();
       const challengeIsPending = isChallengePending();
       const challengeIsOpen = isChallengeOpen();
 
       if (!challengeIsClosed && requireChallengeClosed) {
-        next({ name: 'redirect' });
+        next({ name: "redirect" });
         return;
       }
 
       if (!challengeIsOpen && requireChallengeOpen) {
-        next({ name: 'redirect' });
+        next({ name: "redirect" });
         return;
       }
 
       if (!challengeIsPending && requireChallengePending) {
-        next({ name: 'redirect' });
+        next({ name: "redirect" });
         return;
       }
 
-      if (!challengeIsOpen && !challengeIsPending && requireChallengeOpenPending) {
-        next({ name: 'redirect' });
+      if (
+        !challengeIsOpen &&
+        !challengeIsPending &&
+        requireChallengeOpenPending
+      ) {
+        next({ name: "redirect" });
         return;
       }
     } catch (err) {
@@ -220,12 +242,12 @@ router.beforeEach(async (to, from, next) => {
     const isAuthenticated = !!auth.currentUser().auth;
 
     if (!isAuthenticated && requireAuth) {
-      next({ name: 'register' });
+      next({ name: "register" });
       return;
     }
 
     if (isAuthenticated && requireAnon) {
-      next({ name: 'redirect' });
+      next({ name: "redirect" });
       return;
     }
   }
diff --git a/src/views/Quiz/QuizCountdown.vue b/src/views/Quiz/QuizCountdown.vue
index 3586a05..164eb3d 100644
--- a/src/views/Quiz/QuizCountdown.vue
+++ b/src/views/Quiz/QuizCountdown.vue
@@ -54,11 +54,11 @@
 </template>
 
 <script>
-  import QuizNeedHelp from "@/components/QuizNeedHelp";
-  import QuizScroll from "@/components/QuizScroll";
-  import {Quiz, User} from "@/store";
+import QuizNeedHelp from "@/components/QuizNeedHelp";
+import QuizScroll from "@/components/QuizScroll";
+import { Quiz, User } from "@/store";
 
-  export default {
+export default {
   name: "quiz",
   components: {
     QuizScroll,
diff --git a/src/views/Voting/Ballot.vue b/src/views/Voting/Ballot.vue
index 3eea5b9..3bffa72 100644
--- a/src/views/Voting/Ballot.vue
+++ b/src/views/Voting/Ballot.vue
@@ -9,14 +9,25 @@
     </v-row>
     <v-row justify="center" v-if="isLoading">
       <v-col class="text-center">
-        <v-progress-circular class="mt-6" color="cwhqBlue" size="100" width="10" indeterminate />
+        <v-progress-circular
+          class="mt-6"
+          color="cwhqBlue"
+          size="100"
+          width="10"
+          indeterminate
+        />
         <h2 class="mt-6">
           Loading Results <small><br />Please Wait</small>
         </h2>
       </v-col>
     </v-row>
     <v-row justify="center" v-else>
-      <ballot-card v-for="(item, i) in items" :key="i" v-bind="item" @click="showCode(item)" />
+      <ballot-card
+        v-for="(item, i) in items"
+        :key="i"
+        v-bind="item"
+        @click="showCode(item)"
+      />
     </v-row>
     <v-row justify="center" v-if="totalPages > 1">
       <v-pagination v-model="page" :length="totalPages" circle></v-pagination>
@@ -26,10 +37,10 @@
 </template>
 
 <script>
-import Vue from 'vue';
-import { voting } from '@/api';
-import BallotCard from './BallotCard';
-import CodeModal from './CodeModal';
+import Vue from "vue";
+import { voting } from "@/api";
+import BallotCard from "./BallotCard";
+import CodeModal from "./CodeModal";
 
 export default {
   components: {
@@ -66,7 +77,7 @@ export default {
           Vue.set(this, key, value);
         }
       } catch (err) {
-        this.$router.push({ name: 'redirect' });
+        this.$router.push({ name: "redirect" });
       }
       this.isLoading = false;
     }
@@ -86,7 +97,7 @@ export default {
 h2 {
   text-align: center;
   color: #0d1d41;
-  font-family: 'Barlow', sans-serif;
+  font-family: "Barlow", sans-serif;
   font-weight: bold;
   margin-bottom: 12px;
 }
diff --git a/src/views/Voting/BallotCard.vue b/src/views/Voting/BallotCard.vue
index 9210424..6e87e3c 100644
--- a/src/views/Voting/BallotCard.vue
+++ b/src/views/Voting/BallotCard.vue
@@ -1,9 +1,16 @@
 <template>
-  <v-card class="ballot ballot-card" light elevation="0" @click="$emit('click')">
+  <v-card
+    class="ballot ballot-card"
+    light
+    elevation="0"
+    @click="$emit('click')"
+  >
     <div class="circle">
       {{ initials }}
     </div>
-    <div class="vote-count">{{ numVotes }} {{ numVotes.length == 1 ? 'vote' : 'votes' }}</div>
+    <div class="vote-count">
+      {{ numVotes }} {{ numVotes.length == 1 ? "vote" : "votes" }}
+    </div>
 
     <v-btn elevation="0" color="cwhqBlue" block>See Code</v-btn>
     <v-btn elevation="0" color="primary" block>Vote</v-btn>
@@ -12,6 +19,16 @@
 
 <script>
 export default {
-  props: ['display', 'firstName', 'id', 'lastName', 'numVotes', 'text', 'username', 'value', 'initials']
+  props: [
+    "display",
+    "firstName",
+    "id",
+    "lastName",
+    "numVotes",
+    "text",
+    "username",
+    "value",
+    "initials"
+  ]
 };
 </script>

From 4ce0be7d3433f70b3428f4662c7df358c57104fb Mon Sep 17 00:00:00 2001
From: net8floz <net8floz@gmail.com>
Date: Fri, 6 Mar 2020 00:03:41 -0800
Subject: [PATCH 4/4] only shows email requirements in ballot cards if the user
 is not logged in

---
 src/components/Toolbars/QuizBar.vue |  5 ++---
 src/views/Voting/CodeModal.vue      |  9 +++++++--
 src/views/Voting/SuccessModal.vue   | 24 +++++++++++++++++++-----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/Toolbars/QuizBar.vue b/src/components/Toolbars/QuizBar.vue
index 882f8ae..b48a550 100644
--- a/src/components/Toolbars/QuizBar.vue
+++ b/src/components/Toolbars/QuizBar.vue
@@ -66,10 +66,9 @@
 </template>
 
 <script>
-  import {Quiz, User} from "@/store";
+import { Quiz, User } from "@/store";
 
-
-  export default {
+export default {
   name: "quizBar",
   computed: {
     ...User.mapState(),
diff --git a/src/views/Voting/CodeModal.vue b/src/views/Voting/CodeModal.vue
index b96ff6d..1b30c42 100644
--- a/src/views/Voting/CodeModal.vue
+++ b/src/views/Voting/CodeModal.vue
@@ -22,6 +22,7 @@
                 v-bind="fields.email"
                 v-model="fields.email.value"
                 :disabled="isSubmitting"
+                v-if="!User.isAuthorized"
               />
               <v-btn
                 block
@@ -29,7 +30,7 @@
                 color="cwhqBlue"
                 type="submit"
                 :disabled="isSubmitting"
-                >Confirm</v-btn
+                >Confirm Vote</v-btn
               >
 
               <v-row no-gutters class="icons" justify="center">
@@ -76,6 +77,7 @@
 <script>
 import * as api from "@/api";
 import SuccessModal from "./SuccessModal";
+import { User } from "@/store";
 
 export default {
   components: {
@@ -98,6 +100,9 @@ export default {
       }
     };
   },
+  computed: {
+    ...User.mapState()
+  },
   props: [
     "display",
     "firstName",
@@ -127,7 +132,7 @@ export default {
         return;
       }
       this.isSubmitting = true;
-      if (!this.fields.email.value) {
+      if (!this.fields.email.value && !this.User.isAuthorized) {
         this.errorMessage = "You forgot to tell us your email";
         this.showError = true;
         this.isSubmitting = false;
diff --git a/src/views/Voting/SuccessModal.vue b/src/views/Voting/SuccessModal.vue
index f96f08d..7979afa 100644
--- a/src/views/Voting/SuccessModal.vue
+++ b/src/views/Voting/SuccessModal.vue
@@ -6,12 +6,22 @@
         <v-btn icon x-large @click="show = false">X</v-btn></v-card-title
       >
 
-      <h3>ALMOST DONE</h3>
+      <div v-if="User.isAuthorized">
+        <h3>SUCCESS!</h3>
 
-      <p>
-        Your vote has been cast! In order for your vote to count you must first
-        confirm your it. Please check your inbox for the confirmation email.
-      </p>
+        <p style="text-align:center">
+          Your vote has been cast!
+        </p>
+      </div>
+      <div v-else>
+        <h3>ALMOST DONE</h3>
+
+        <p>
+          Your vote has been cast! In order for your vote to count you must
+          first confirm your it. Please check your inbox for the confirmation
+          email.
+        </p>
+      </div>
       <hr />
       <h4>
         Share this code with your friends!
@@ -34,8 +44,12 @@
 </template>
 
 <script>
+import { User } from "@/store";
 export default {
   props: ["value"],
+  computed: {
+    ...User.mapState()
+  },
   watch: {
     show() {
       if (this.show != this.value) {