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

✨ Sentry in Backend, Image-Import, Settings-function improvement and reload detection

Browse Source
This commit is contained in:
Mawoka
2022-03-30 18:29:09 +02:00
parent 20e655e18d
commit e413c0191d
17 changed files with 3349 additions and 4272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/play/question.svelte
+14 -12
View File
@@ -1,4 +1,4 @@
<script lang="ts">
<script lang='ts'>
import type { Question } from '../../app';
import { socket } from '$lib/socket';
@@ -42,37 +42,39 @@
};
</script>
<div class="flex flex-col justify-center w-screen h-1/6">
<h1 class="text-6xl text-center">
<div class='flex flex-col justify-center w-screen h-1/6'>
<h1 class='text-6xl text-center'>
{question.question}
</h1>
<span class="text-center py-2 text-lg">{timer_res}</span>
</div>
<div>
<img src='{question.image}' class="w-full h-full object-cover" alt='Question image'>
<span class='text-center py-2 text-lg'>{timer_res}</span>
</div>
{#if question.image !== null}
<div>
<img src='{question.image}' class='w-full h-full object-cover' alt='Question image'>
</div>
{/if}
{#if timer_res !== '0'}
<div class="flex flex-wrap">
<div class='flex flex-wrap'>
{#each question.answers as answer}
<button
class="w-1/2 text-3xl bg-amber-700 my-2 disabled:opacity-60 border border-white"
class='w-1/2 text-3xl bg-amber-700 my-2 disabled:opacity-60 border border-white'
disabled={selected_answer !== undefined}
on:click={() => selectAnswer(answer.answer)}>{answer.answer}</button
>
{/each}
</div>
{:else}
<div class="flex flex-wrap">
<div class='flex flex-wrap'>
{#each question.answers as answer}
{#if answer.right}
<button
class="w-1/2 text-3xl bg-green-600 border border-white"
class='w-1/2 text-3xl bg-green-600 border border-white'
disabled
class:opacity-30={answer.answer !== selected_answer}>{answer.answer}</button
>
{:else}
<button
class="w-1/2 text-3xl bg-red-500 border border-white"
class='w-1/2 text-3xl bg-red-500 border border-white'
disabled
class:opacity-30={answer.answer !== selected_answer}>{answer.answer}</button
>
frontend/src/routes/__layout.svelte
+1
View File
@@ -12,6 +12,7 @@
Sentry.init({
dsn: import.meta.env.VITE_SENTRY,
integrations: [new BrowserTracing()],
// Set tracesSampleRate to 1.0 to capture 100%
// of transactions for performance monitoring.
frontend/src/routes/account/login.svelte
+106 -86
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 {
@@ -10,9 +10,11 @@
}
</script>
<script lang="ts">
<script lang='ts'>
import * as Sentry from "@sentry/browser";
import { navbarVisible } from '$lib/stores';
import { browser } from '$app/env';
import Cookies from 'js-cookie';
import { getLocalization } from '$lib/i18n';
import Footer from '$lib/footer.svelte';
@@ -37,10 +39,28 @@
$: passwordEmpty = loginData.password === '';
$: inputValid = !emailEmpty && !passwordEmpty;
const reloadWindow = () => {
const expireIn60Sec = new Date(new Date().getTime() + 60 * 1000);
if (Cookies.get('reload') === null) {
Cookies.set('reload', '1', { expires: expireIn60Sec });
} else {
const cookie: string = Cookies.get('reload');
if (parseInt(cookie) >= 3) {
if (import.meta.env.VITE_SENTRY !== null) {
Sentry.captureException(new Error('Reload loop'));
}
fetch("/api/v1/users/logout")
Cookies.remove("reload")
}
Cookies.set('reload', String(parseInt(cookie) + 1), { expires: expireIn60Sec });
}
window.location.reload();
};
const checkRememberMe = async () => {
const res = await fetch('/api/v1/users/token/rememberme');
if (res.status === 200) {
window.location.reload();
reloadWindow();
}
};
if (browser) {
@@ -74,89 +94,89 @@
<svelte:head>
<title>ClassQuiz - Login</title>
</svelte:head>
<div class="flex items-center justify-center h-full px-4">
<div class='flex items-center justify-center h-full px-4'>
<div>
<span class="p-4" />
<span class='p-4' />
<div
class="w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
class='w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800'
>
<div class="px-6 py-4">
<h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">
<div class='px-6 py-4'>
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'>
ClassQuiz
</h2>
<h3 class="mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200">
<h3 class='mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200'>
{$t('login_page.welcome_back')}
</h3>
<p class="mt-1 text-center text-gray-500 dark:text-gray-400">
<p class='mt-1 text-center text-gray-500 dark:text-gray-400'>
{$t('login_page.login_or_create_account')}
</p>
<form on:submit|preventDefault={login}>
<div class="w-full mt-4">
<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class="relative bg-inherit w-full">
<div class='w-full mt-4'>
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
<div class='relative bg-inherit w-full'>
<input
id="email"
id='email'
bind:value={loginData.email}
name="email"
type="email"
class="w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600"
name='email'
type='email'
class='w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600'
placeholder={$t('words.email')}
/>
<label
for="email"
class="absolute cursor-text left-0 -top-3 text-sm text-gray-700 dark:text-white bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all"
for='email'
class='absolute cursor-text left-0 -top-3 text-sm text-gray-700 dark:text-white bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all'
>
{$t('words.email')}
</label>
</div>
</div>
<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class="relative bg-inherit w-full">
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
<div class='relative bg-inherit w-full'>
<input
id="password"
name="password"
type="password"
id='password'
name='password'
type='password'
bind:value={loginData.password}
class="w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600"
class='w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600'
placeholder={$t('words.password')}
/>
<label
for="password"
class="absolute cursor-text left-0 -top-3 text-sm text-gray-500 bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all"
for='password'
class='absolute cursor-text left-0 -top-3 text-sm text-gray-500 bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all'
>
{$t('words.password')}
</label>
</div>
</div>
<div class="flex items-center justify-between mt-4">
<div class='flex items-center justify-between mt-4'>
<a
href="/account/reset-password"
class="text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500"
>{$t('register_page.forgot_password?')}</a
href='/account/reset-password'
class='text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500'
>{$t('register_page.forgot_password?')}</a
>
<button
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
disabled={!inputValid}
type="submit"
type='submit'
>
{#if isSubmitting}
<svg
class="h-4 w-4 animate-spin mx-auto my-20"
viewBox="3 3 18 18"
class='h-4 w-4 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>
{:else}
@@ -169,16 +189,16 @@
</div>
<div
class="flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700"
class='flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700'
>
<span class="text-sm text-gray-600 dark:text-gray-200"
>{$t('login_page.already_have_account')}
<span class='text-sm text-gray-600 dark:text-gray-200'
>{$t('login_page.already_have_account')}
</span>
<a
href="/account/register"
class="mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline"
>{$t('words.register')}</a
href='/account/register'
class='mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline'
>{$t('words.register')}</a
>
</div>
</div>
@@ -186,14 +206,14 @@
</div>
<Footer />
<div
class="fixed z-10 inset-0 overflow-y-auto"
aria-labelledby="modal-title"
role="dialog"
aria-modal="true"
class='fixed z-10 inset-0 overflow-y-auto'
aria-labelledby='modal-title'
role='dialog'
aria-modal='true'
class:hidden={!responseData.open}
>
<div
class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
class='flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0'
>
<!--
Background overlay, show/hide based on modal state.
@@ -206,13 +226,13 @@
To: "opacity-0"
-->
<div
class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
aria-hidden="true"
class='fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity'
aria-hidden='true'
/>
<!-- This element is to trick the browser into centering the modal contents. -->
<span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true"
>&#8203;</span
<span class='hidden sm:inline-block sm:align-middle sm:h-screen' aria-hidden='true'
>&#8203;</span
>
<!--
@@ -226,49 +246,49 @@
To: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-->
<div
class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
class='inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full'
>
<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class='bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4'>
<div class='sm:flex sm:items-start'>
<div
class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10"
class='mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10'
>
<!-- Heroicon name: outline/exclamation -->
{#if responseData.data === '404' || responseData.data === 'error'}
<svg
class="h-6 w-6 text-red-600"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
aria-hidden="true"
class='h-6 w-6 text-red-600'
xmlns='http://www.w3.org/2000/svg'
fill='none'
viewBox='0 0 24 24'
stroke='currentColor'
aria-hidden='true'
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
stroke-linecap='round'
stroke-linejoin='round'
stroke-width='2'
d='M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z'
/>
</svg>
{:else}
<svg
class="w-6 h-6 text-green-600"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
class='w-6 h-6 text-green-600'
fill='none'
stroke='currentColor'
viewBox='0 0 24 24'
xmlns='http://www.w3.org/2000/svg'
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
stroke-linecap='round'
stroke-linejoin='round'
stroke-width='2'
d='M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z'
/>
</svg>
{/if}
</div>
<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
<h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
<div class='mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left'>
<h3 class='text-lg leading-6 font-medium text-gray-900' id='modal-title'>
{#if responseData.data === 'magic'}
{$t('login_page.modal.success.success_check_mail')}
{:else if responseData.data === 'password'}
@@ -281,8 +301,8 @@
You stupid Mawoka!
{/if}
</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
<div class='mt-2'>
<p class='text-sm text-gray-500'>
{#if responseData.data === 'magic'}
{$t('login_page.modal.success.description.success_check_mail')}
{:else if responseData.data === 'password'}
@@ -299,17 +319,17 @@
</div>
</div>
</div>
<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
<div class='bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse'>
<button
type="button"
type='button'
on:click={() => {
responseData.open = false;
if (responseData.data === 'magic' || responseData.data === 'password') {
window.location.reload();
reloadWindow();
}
}}
class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
>{$t('words.close')}
class='mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm'
>{$t('words.close')}
</button>
</div>
</div>
frontend/src/routes/docs/import-from-kahoot.svelte
+1 -2
View File
@@ -25,8 +25,7 @@
<h2>Limitations</h2>
<ul>
<li>Videos don't get imported</li>
<li>Pictures don't get imported</li>
<li>Metadata doesn't get imported</li>
<li>Metadata doesn't get imported (Stuff like create-date, cover-image, etc.)</li>
<li>Point-multipliers don't get imported</li>
</ul>
</article>
frontend/src/routes/import.svelte
+1 -1
View File
@@ -124,7 +124,7 @@
>
{#if is_loading}
<svg
class="h-4 w-4 animate-spin mx-auto my-20"
class="h-4 w-4 animate-spin mx-auto"
viewBox="3 3 18 18"
>
<path