Merge pull request #42 from codewizardshq/voting-and-design

fixes bug causing bypass of intro video

Author: net8floz

.github/workflows/code-quality-checks.yml

@@ -25,7 +25,7 @@ jobs:
  npm install -g yarn
  yarn install
  - name: Install MySQL Client
- run: sudo apt install default-libmysqlclient-dev
+ run: sudo apt update && sudo apt install default-libmysqlclient-dev
  - name: Install Python dependencies
  run: |
  python -m pip install --upgrade pip

package.json

@@ -14,6 +14,7 @@
  "serialize-javascript": "^2.1.2",
  "vue": "^2.6.10",
  "vue-codemirror": "^4.0.6",
+ "vue-marquee-text-component": "^1.1.1",
  "vue-moment": "^4.1.0",
  "vue-router": "^3.1.3",
  "vue-the-mask": "^0.11.1",

public/images/blue-answer-box-bg.png

@@ -5,6 +5,7 @@
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+ <link href="https://fonts.googleapis.com/css?family=Barlow:400,700&display=swap" rel="stylesheet"> 
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
  <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
  <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">

public/images/book.png

@@ -1,10 +1,14 @@
 <template>
  <v-app>
+ <CWHQ-bar />
  <app-bar />
  <quiz-bar />
  <v-content>
+ <!-- <v-container> -->
  <router-view />
+ <!-- </v-container> -->
  </v-content>
+ <leaderboard-bar />
  <snackbar />
  </v-app>
 </template>
@@ -13,13 +17,17 @@
 import AppBar from "@/components/AppBar";
 import QuizBar from "@/components/QuizBar";
 import Snackbar from "@/components/Snackbar";
+import CWHQBar from "@/components/CWHQBar";
+import LeaderboardBar from "@/components/LeaderboardBar";
 
 export default {
  name: "App",
  components: {
  AppBar,
  QuizBar,
- Snackbar
+ Snackbar,
+ CWHQBar,
+ LeaderboardBar
  }
 };
 </script>

public/images/shield-background.png

@@ -12,7 +12,7 @@ let state = {
  displayName: null,
  firstName: null,
  lastName: null,
- rank: 0
+ rank: -1
 };
 
 async function setState(newState) {
@@ -71,7 +71,7 @@ async function autoLogin() {
 
 async function logout() {
  await request(routes.userapi_logout, {}, false);
- await setState({ auth: false });
+ await setState({ auth: false, rank: -1 });
 }
 
 function currentUser() {

public/index.html

@@ -1,2 +1,3 @@
 export { default as auth } from "./auth";
 export { default as quiz } from "./quiz";
+export { default as voting } from "./voting";

src/App.vue

@@ -22,6 +22,10 @@ async function submit(answer) {
  return result.correct;
 }
 
+async function getLeaderboard() {
+ return request(routes.questionsapi_leaderboard, { per: 1000000 });
+}
+
 async function submitFinal(answer, language, checkOnly) {
  const result = await request(routes.questionsapi_answer_final_question, {
  data: {
@@ -38,5 +42,6 @@ export default {
  submit,
  submitFinal,
  getRank,
- resetRank
+ resetRank,
+ getLeaderboard
 };