LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚧 Added winner-screen

Browse Source
This commit is contained in:
Mawoka
2022-04-10 13:10:21 +02:00
parent f3b6dc420b
commit 88a8cec5b2
15 changed files with 4843 additions and 3607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/routes/__layout.svelte
+1 -1
View File
@@ -9,7 +9,7 @@
initLocalizationContext();
if (import.meta.env.VITE_SENTRY !== undefined) {
console.log(import.meta.env.VITE_SENTRY)
console.log(import.meta.env.VITE_SENTRY);
Sentry.init({
dsn: String(import.meta.env.VITE_SENTRY),
integrations: [new BrowserTracing()],
frontend/src/routes/account/password-reset.svelte
+4 -4
View File
@@ -10,7 +10,7 @@
}
</script>
<script lang='ts'>
<script lang="ts">
import { getLocalization } from '../../lib/i18n';
const { t } = getLocalization();
@@ -20,7 +20,7 @@
password1: string;
password2: string;
}
let passwordData: PasswordData = {
let passwordData: PasswordData = {
password1: '',
password2: ''
};
@@ -55,7 +55,7 @@
};
</script>
<div class='flex items-center justify-center h-full px-4'>
<div class="flex items-center justify-center h-full px-4">
<div>
<div
class="w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
@@ -126,7 +126,7 @@
type="submit"
>
{#if isSubmitting}
<svg class='h-4 w-4 animate-spin mx-auto' viewBox='3 3 18 18'>
<svg class="h-4 w-4 animate-spin mx-auto" viewBox="3 3 18 18">
<path
class="fill-black"
d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
frontend/src/routes/account/settings.svelte
+21 -21
View File
@@ -28,9 +28,9 @@
}
interface ChangePasswordData {
oldPassword: string,
newPassword: string,
newPasswordConfirm: string
oldPassword: string;
newPassword: string;
newPasswordConfirm: string;
}
let changePasswordData: ChangePasswordData = {
@@ -107,32 +107,32 @@
/>
</div>
<div>
<h1 class='text-slate-100 text-4xl font-bold my-2'>{user.username}</h1>
<p class='text-slate-100 text-lg mb-6 md:max-w-lg'>
<h1 class="text-slate-100 text-4xl font-bold my-2">{user.username}</h1>
<p class="text-slate-100 text-lg mb-6 md:max-w-lg">
{$t('words.email')}: {user.email}
</p>
<!-- TODO: Add translation -->
<form class='flex flex-col md:flex-row' on:submit|preventDefault={changePassword}>
<form class="flex flex-col md:flex-row" on:submit|preventDefault={changePassword}>
<label
>Old Password:<input
type='password'
class='m-2 text-black'
bind:value={changePasswordData.oldPassword}
/></label
>Old Password:<input
type="password"
class="m-2 text-black"
bind:value={changePasswordData.oldPassword}
/></label
>
<label
>New Password:<input
type='password'
class='m-2 text-black'
bind:value={changePasswordData.newPassword}
/></label
>New Password:<input
type="password"
class="m-2 text-black"
bind:value={changePasswordData.newPassword}
/></label
>
<label
>New Password again:<input
type='password'
class='m-2 text-black'
bind:value={changePasswordData.newPasswordConfirm}
/></label
>New Password again:<input
type="password"
class="m-2 text-black"
bind:value={changePasswordData.newPasswordConfirm}
/></label
>
<button
class="border-2 px-2 py-1 rounded-md border-black text-slate-100 hover:bg-amber-700 hover:text-indigo-100 transition duration-75 disabled:cursor-not-allowed disabled:opacity-50"
frontend/src/routes/admin.svelte
+54 -1
View File
@@ -41,15 +41,24 @@
export let auto_connect: boolean;
export let game_token: string;
let success = false;
interface Player {
username: string
username: string;
}
interface PlayerAnswer {
username: string;
answer: string;
right: string;
}
let players: Array<Player> = [];
let errorMessage = '';
let game_started = false;
let quiz_data: QuizData;
//let question_number = '0';
let question_results = null;
let final_results: Array<null> | Array<Array<PlayerAnswer>> = [null];
let shown_question_now: number;
const connect = () => {
@@ -91,12 +100,55 @@
});
};
const getWinnersSorted = () => {
let winners = {};
let q_count = quiz_data.questions.length;
for (let i = 0; i < q_count; i++) {
let q_res = final_results[i];
if (q_res === null) {
continue;
}
for (let j = 0; j < q_res.length; j++) {
let res = q_res[j];
if (res['right']) {
if (winners[res['username']] === undefined) {
winners[res['username']] = 0;
}
winners[res['username']] += 1;
}
}
}
function sortObjectbyValue(obj) {
const asc = false;
const ret = {};
Object.keys(obj)
.sort((a, b) => obj[asc ? a : b] - obj[asc ? b : a])
.forEach((s) => (ret[s] = obj[s]));
return ret;
}
return sortObjectbyValue(winners);
};
socket.on('question_results', (data) => {
data = JSON.parse(data);
console.log(data);
question_results = data;
});
const get_final_results = () => {
socket.emit('get_final_results', {});
};
socket.on('final_results', (data) => {
// data = JSON.parse(data);
console.log(data);
final_results = data;
console.log(getWinnersSorted());
});
const timer = (time: string) => {
let seconds = Number(time);
let timer_interval = setInterval(() => {
@@ -173,4 +225,5 @@
>
<br />
{/each}
<button on:click={get_final_results}>Get final results</button>
{/if}
frontend/src/routes/overview.svelte
+125 -125
View File
@@ -1,4 +1,4 @@
<script context='module' lang='ts'>
<script context="module" lang="ts">
export async function load({ session }) {
if (!session.authenticated) {
return {
@@ -14,7 +14,7 @@
}
</script>
<script lang='ts'>
<script lang="ts">
import type { Question } from '../app';
import { DateTime } from 'luxon';
import { getLocalization } from '$lib/i18n';
@@ -74,161 +74,161 @@
<title>ClassQuiz - Overview</title>
</svelte:head>
<div class='min-h-screen flex flex-col'>
<div class="min-h-screen flex flex-col">
{#await getData()}
<svg class='h-8 w-8 animate-spin mx-auto my-20' viewBox='3 3 18 18'>
<svg class="h-8 w-8 animate-spin mx-auto my-20" viewBox="3 3 18 18">
<path
class='fill-black'
d='M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z'
class="fill-black"
d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
/>
<path
class='fill-blue-100'
d='M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z'
class="fill-blue-100"
d="M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z"
/>
</svg>
{:then quizzes}
<div class='flex flex-col w-fit mx-auto'>
<div class="flex flex-col w-fit mx-auto">
<!-- <button
class='px-4 py-2 font-medium tracking-wide text-gray-500 whitespace-nowrap dark:text-gray-400 capitalize transition-colors dark:bg-gray-700 duration-200 transform bg-gray-50 rounded-md hover:bg-green-600 focus:outline-none focus:ring focus:ring-blue-300 focus:ring-opacity-80'>
Primary
</button>-->
<div class='w-full grid grid-cols-4 gap-2'>
<div class="w-full grid grid-cols-4 gap-2">
<a
href='/create'
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
>{$t('words.create')}
href="/create"
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
>{$t('words.create')}
</a>
<a
href='/import'
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
>{$t('words.import')}
href="/import"
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
>{$t('words.import')}
</a>
<a
href='/api/v1/users/logout'
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
>{$t('words.logout')}
href="/api/v1/users/logout"
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
>{$t('words.logout')}
</a>
<a
href='/account/settings'
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
href="/account/settings"
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
>
{$t('words.settings')}
</a>
</div>
<div class='overflow-x-auto sm:-mx-8 lg:-mx-8'>
<div class='inline-block py-2 min-w-full sm:px-6 lg:px-8'>
<div class='overflow-hidden shadow-md sm:rounded-lg'>
<table class='min-w-full'>
<thead class='bg-gray-50 dark:bg-gray-700'>
<tr>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('words.title')}
</th>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('overview_page.created_at')}
</th>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('overview_page.question_count')}
</th>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('words.play')}
</th>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('words.edit')}
</th>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('words.delete')}
</th>
<th
scope='col'
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400'
>
{$t('words.public')}
</th>
</tr>
<div class="overflow-x-auto sm:-mx-8 lg:-mx-8">
<div class="inline-block py-2 min-w-full sm:px-6 lg:px-8">
<div class="overflow-hidden shadow-md sm:rounded-lg">
<table class="min-w-full">
<thead class="bg-gray-50 dark:bg-gray-700">
<tr>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('words.title')}
</th>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('overview_page.created_at')}
</th>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('overview_page.question_count')}
</th>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('words.play')}
</th>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('words.edit')}
</th>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('words.delete')}
</th>
<th
scope="col"
class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
>
{$t('words.public')}
</th>
</tr>
</thead>
<tbody>
{#each quizzes as quiz}
<tr
class='bg-white border-b dark:bg-gray-800 dark:border-gray-700'
>
<td
class='py-4 px-6 text-sm font-medium text-gray-900 whitespace-nowrap dark:text-white'
{#each quizzes as quiz}
<tr
class="bg-white border-b dark:bg-gray-800 dark:border-gray-700"
>
{quiz.title}
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
{formatDate(quiz.created_at)}
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
{quiz.questions.length}
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
<button
on:click={() => {
<td
class="py-4 px-6 text-sm font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
{quiz.title}
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
{formatDate(quiz.created_at)}
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
{quiz.questions.length}
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
<button
on:click={() => {
startGame(quiz.id);
}}
class='border border-green-600'
class="border border-green-600"
>
{$t('words.start')}
</button>
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
{$t('words.start')}
</button>
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
<a
href='/edit?quiz_id={quiz.id}'
class='border border-yellow-600'
>{$t('words.edit')}</a
<a
href="/edit?quiz_id={quiz.id}"
class="border border-yellow-600"
>{$t('words.edit')}</a
>
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
<button
on:click={() => {
<button
on:click={() => {
deleteQuiz(quiz.id);
}}
class='border border-red-600'
class="border border-red-600"
>
{$t('words.delete')}
</button>
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
{$t('words.delete')}
</button>
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
{#if quiz.public}
✅
{:else}
❌
{/if}
</td>
</tr>
{/each}
{#if quiz.public}
✅
{:else}
❌
{/if}
</td>
</tr>
{/each}
</tbody>
</table>
</div>
frontend/src/routes/play.svelte
+20 -4
View File
@@ -1,4 +1,4 @@
<script context='module' lang='ts'>
<script context="module" lang="ts">
import { signedIn } from '$lib/stores';
export async function load({ url, session }) {
@@ -14,7 +14,7 @@
}
</script>
<script lang='ts'>
<script lang="ts">
import { socket } from '$lib/socket';
import JoinGame from '$lib/play/join.svelte';
import type { Answer, QuizData } from '../app';
@@ -22,6 +22,7 @@
import Question from '$lib/play/question.svelte';
import ShowResults from '$lib/play/show_results.svelte';
import { navbarVisible } from '$lib/stores';
import ShowEndScreen from '$lib/play/end.svelte';
// Exports
export let game_pin: string;
@@ -31,8 +32,16 @@
started: boolean;
}
let final_results: Array<null> | Array<Array<PlayerAnswer>> = [null];
interface PlayerAnswer {
username: string;
answer: string;
right: string;
}
// Variables init
let question_index: string = '';
let question_index = '';
let unique = {};
navbarVisible.set(false);
let game_pin_valid: boolean;
@@ -72,7 +81,12 @@
restart();
answer_results = JSON.parse(data);
});
socket.on('final_results', (data) => {
final_results = data;
});
// The rest
console.log(final_results, JSON.stringify(final_results) !== JSON.stringify([null]));
</script>
<svelte:head>
@@ -80,7 +94,7 @@
{#if gameData !== undefined}
{#each gameData.questions as question}
{#if question.image !== undefined}
<link rel='preload' as='image' href={question.image} />
<link rel="preload" as="image" href={question.image} />
{/if}
{/each}
{/if}
@@ -88,6 +102,8 @@
<div>
{#if !gameMeta.started && gameData === undefined}
<JoinGame {game_pin} />
{:else if JSON.stringify(final_results) !== JSON.stringify([null])}
<ShowEndScreen bind:final_results bind:quiz_data={gameData} />
{:else if gameData !== undefined && question_index === ''}
<ShowTitle bind:title={gameData.title} bind:description={gameData.description} />
{:else if gameMeta.started && gameData !== undefined && question_index !== '' && answer_results === undefined}