From 59ceef93058c9c3a1405da12be96727387595fb8 Mon Sep 17 00:00:00 2001
From: Jeffrey Whitaker <jeffrey.david.whitaker@zoho.com>
Date: Fri, 7 May 2021 14:56:40 -0700
Subject: [PATCH 1/2] style VotingOver, fix width in QuizScroll
---
src/components/QuizScroll.vue | 2 +-
src/views/Voting/VotingOver.vue | 43 ++++++++++++++-------------------
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/components/QuizScroll.vue b/src/components/QuizScroll.vue
index 5ab770e..5bfa1c1 100644
--- a/src/components/QuizScroll.vue
+++ b/src/components/QuizScroll.vue
@@ -21,7 +21,7 @@ export default {
<style lang="scss" scoped>
.quiz-scroll {
- width: 550px;
+ max-width: 550px;
display: flex;
margin: 30px 0;
padding: 10px 0;
diff --git a/src/views/Voting/VotingOver.vue b/src/views/Voting/VotingOver.vue
index 6a45d64..2738f16 100644
--- a/src/views/Voting/VotingOver.vue
+++ b/src/views/Voting/VotingOver.vue
@@ -1,41 +1,34 @@
<template>
<v-container>
- <v-row>
- <v-col class="inside-div">
- <h2 class="ballot-header">
- Voting is over!
- </h2>
+ <QuizScroll class="scroll">
+ <template v-slot:title>
+ Voting Level Complete
+ </template>
+ <template v-slot:default>
<p>
- Please check back soon for the results.
+ Congratulations to the top 10 students with the most votes! Thank you
+ everyone for participating. Finalists will receive a notification and
+ your code will be reviewed by the Galactic Wizard Panel on May 10-13.
+ Our grand prize winner will be announced May 14.
</p>
- </v-col>
- </v-row>
+ <Leaderboard />
+ </template>
+ </QuizScroll>
</v-container>
</template>
<script>
// TODO: this and VoteWoah should be a single component with props
+import Leaderboard from "@/components/Leaderboard";
+import QuizScroll from "@/components/QuizScroll";
export default {
- name: "VotingWoah"
+ name: "VotingWoah",
+ components: { Leaderboard, QuizScroll }
};
</script>
<style lang="scss" scoped>
-.inside-div {
- background: gray;
-}
-
-h2 {
- text-align: center;
- color: #0d1d41;
- font-family: "Barlow", sans-serif;
- font-weight: bold;
- margin-bottom: 12px;
-}
-
-p {
- text-align: center;
- color: #0d1d41;
- font-family: "Barlow", sans-serif;
+.scroll {
+ margin: 0 auto;
}
</style>
From d445bbc62e20ebbd4d225514b51e3340c5f79652 Mon Sep 17 00:00:00 2001
From: Jeffrey Whitaker <jeffrey.david.whitaker@zoho.com>
Date: Fri, 7 May 2021 15:03:57 -0700
Subject: [PATCH 2/2] update name in VotingOver
---
src/views/Voting/VotingOver.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/Voting/VotingOver.vue b/src/views/Voting/VotingOver.vue
index 2738f16..296db82 100644
--- a/src/views/Voting/VotingOver.vue
+++ b/src/views/Voting/VotingOver.vue
@@ -22,7 +22,7 @@
import Leaderboard from "@/components/Leaderboard";
import QuizScroll from "@/components/QuizScroll";
export default {
- name: "VotingWoah",
+ name: "VotingOver",
components: { Leaderboard, QuizScroll }
};
</script>