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

Merge branch 'master' into chores/add-minimal-ci

Browse Source
This commit is contained in:
Dynnammo
2022-04-09 16:37:48 +02:00
committed by GitHub
parent 7da2fb7952 f54d3ac9d0
commit f8b1b8814b
59 changed files with 4412 additions and 5052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/routes/__layout.svelte
+4 -3
View File
@@ -1,16 +1,17 @@
<script>
import '../app.css';
import Navbar from '$lib/navbar.svelte';
import { navbarVisible } from '$lib/stores.ts';
import { navbarVisible } from '$lib/stores';
import * as Sentry from '@sentry/browser';
import { BrowserTracing } from '@sentry/tracing';
import { initLocalizationContext } from '$lib/i18n';
initLocalizationContext();
if (import.meta.env.VITE_SENTRY !== null) {
if (import.meta.env.VITE_SENTRY !== undefined) {
console.log(import.meta.env.VITE_SENTRY)
Sentry.init({
dsn: import.meta.env.VITE_SENTRY,
dsn: String(import.meta.env.VITE_SENTRY),
integrations: [new BrowserTracing()],
// Set tracesSampleRate to 1.0 to capture 100%
frontend/src/routes/account/__layout.svelte
+18
View File
@@ -0,0 +1,18 @@
<script lang="ts" context="module">
import { signedIn } from '$lib/stores';
export async function load({ session }) {
if (session.authenticated) {
signedIn.set(true);
}
return {};
}
</script>
<script lang="ts">
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
</script>
<slot />
frontend/src/routes/account/password-reset.svelte
+9 -5
View File
@@ -10,18 +10,22 @@
}
</script>
<script lang="ts">
<script lang='ts'>
import { getLocalization } from '../../lib/i18n';
const { t } = getLocalization();
export let token: string;
let isSubmitting = false;
let passwordData = {
interface PasswordData {
password1: string;
password2: string;
}
let passwordData: PasswordData = {
password1: '',
password2: ''
};
let passwordsValid = false;
const checkIfPasswordsValid = (pwdata) => {
const checkIfPasswordsValid = (pwdata: PasswordData): void => {
passwordsValid = pwdata.password1 === pwdata.password2 && pwdata.password1.length >= 8;
};
$: checkIfPasswordsValid(passwordData);
@@ -51,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"
@@ -122,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/reset-password.svelte
+3
View File
@@ -12,6 +12,9 @@
<script lang="ts">
import { getLocalization } from '../../lib/i18n';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
const { t } = getLocalization();
frontend/src/routes/account/settings.svelte
+26 -18
View File
@@ -27,15 +27,20 @@
created_at: string;
}
let changePasswordData = {
interface ChangePasswordData {
oldPassword: string,
newPassword: string,
newPasswordConfirm: string
}
let changePasswordData: ChangePasswordData = {
oldPassword: '',
newPassword: '',
newPasswordConfirm: ''
};
let passwordChangeDataValid = false;
const checkPasswords = (data) => {
console.log('Check password');
const checkPasswords = (data: ChangePasswordData): void => {
passwordChangeDataValid =
data.newPassword === data.newPasswordConfirm &&
data.newPassword.length >= 8 &&
@@ -102,29 +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
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
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
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
+7 -1
View File
@@ -27,6 +27,9 @@
import { socket } from '$lib/socket';
import { getLocalization } from '$lib/i18n';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(false);
const { t } = getLocalization();
@@ -38,7 +41,10 @@
export let auto_connect: boolean;
export let game_token: string;
let success = false;
let players: Array<string> = [];
interface Player {
username: string
}
let players: Array<Player> = [];
let errorMessage = '';
let game_started = false;
let quiz_data: QuizData;
frontend/src/routes/create.svelte
+8
View File
@@ -1,4 +1,6 @@
<script context="module" lang="ts">
import { signedIn } from '$lib/stores';
export async function load({ session, url }) {
if (!session.authenticated) {
return {
@@ -6,6 +8,9 @@
redirect: '/account/login'
};
}
if (session.authenticated) {
signedIn.set(true);
}
const token = url.searchParams.get('token');
const pin = url.searchParams.get('pin');
let auto_connect = url.searchParams.get('connect') !== null;
@@ -26,6 +31,9 @@
import { onMount } from 'svelte';
import Editor from '$lib/editor.svelte';
import { getLocalization } from '$lib/i18n';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
const { t } = getLocalization();
frontend/src/routes/debug.svelte
+3
View File
@@ -3,6 +3,9 @@
import Title from '$lib/play/title.svelte';
import Question from '$lib/play/question.svelte';
import { socket } from '$lib/socket';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
interface GameMeta {
started: boolean;
frontend/src/routes/docs/__layout.svelte
+14
View File
@@ -1,5 +1,19 @@
<script lang="ts" context="module">
import { signedIn } from '$lib/stores';
export async function load({ session }) {
if (session.authenticated) {
signedIn.set(true);
}
return {};
}
</script>
<script lang="ts">
import Footer from '$lib/footer.svelte';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
</script>
<div class="min-h-screen flex flex-col">
frontend/src/routes/edit.svelte
+9 -1
View File
@@ -1,4 +1,5 @@
<script lang="ts" context="module">
import { signedIn } from '$lib/stores';
export async function load({ url, session }) {
if (!session.authenticated) {
return {
@@ -6,6 +7,10 @@
redirect: '/account/login'
};
}
if (session.authenticated) {
signedIn.set(true);
}
const quiz_id = url.searchParams.get('quiz_id');
if (quiz_id === null) {
return {
@@ -23,6 +28,9 @@
<script lang="ts">
import Editor from '$lib/editor.svelte';
import { getLocalization } from '$lib/i18n';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
const { t } = getLocalization();
@@ -94,7 +102,7 @@
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 lol}
{:then _}
{#if data !== undefined}
<form on:submit|preventDefault={submit} class="grid grid-cols-1 gap-2">
<Editor bind:data submit_button_text={$t('words.save')} />
frontend/src/routes/import.svelte
+8
View File
@@ -1,10 +1,15 @@
<script context="module" lang="ts">
import { signedIn } from '$lib/stores';
export async function load({ session }) {
if (!session.authenticated) {
return {
status: 302,
redirect: '/account/login'
};
} else {
if (session.authenticated) {
signedIn.set(true);
}
}
return {
props: {
@@ -16,6 +21,9 @@
<script lang="ts">
import { getLocalization } from '$lib/i18n';
import { navbarVisible } from '$lib/stores';
navbarVisible.set(true);
const { t } = getLocalization();
let url_input = '';
frontend/src/routes/index.svelte
+11
View File
@@ -1,3 +1,14 @@
<script lang="ts" context="module">
import { signedIn } from '$lib/stores';
export async function load({ session }) {
if (session.authenticated) {
signedIn.set(true);
}
return {};
}
</script>
<script lang="ts">
import { navbarVisible } from '$lib/stores';
import { getLocalization } from '$lib/i18n';
frontend/src/routes/overview.svelte
+141 -126
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,11 +14,26 @@
}
</script>
<script lang="ts">
import type { QuizData } from '../app';
<script lang='ts'>
import type { Question } from '../app';
import { DateTime } from 'luxon';
import { getLocalization } from '$lib/i18n';
import Footer from '$lib/footer.svelte';
import { navbarVisible, signedIn } from '$lib/stores';
interface QuizData {
id: string;
public: boolean;
title: string;
description: string;
created_at: string;
updated_at: string;
user_id: string;
questions: Question[];
}
signedIn.set(true);
navbarVisible.set(true);
const { t } = getLocalization();
const getData = async (): Promise<Array<QuizData>> => {
@@ -59,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"
{#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'
>
<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={() => {
{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"
>
{$t('words.start')}
</button>
</td>
<td
class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
class='border border-green-600'
>
<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"
{$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
>
<button
on:click={() => {
</td>
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
<button
on:click={() => {
deleteQuiz(quiz.id);
}}
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"
class='border border-red-600'
>
{#if quiz.public}
✅
{:else}
❌
{/if}
</td>
</tr>
{/each}
{$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}
</tbody>
</table>
</div>
frontend/src/routes/play.svelte
+10 -5
View File
@@ -1,5 +1,10 @@
<script context="module" lang="ts">
export async function load({ url }) {
<script context='module' lang='ts'>
import { signedIn } from '$lib/stores';
export async function load({ url, session }) {
if (session.authenticated) {
signedIn.set(true);
}
const token = url.searchParams.get('pin');
return {
props: {
@@ -9,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';
@@ -27,7 +32,7 @@
}
// Variables init
let question_index = '';
let question_index: string = '';
let unique = {};
navbarVisible.set(false);
let game_pin_valid: boolean;
@@ -75,7 +80,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}