🚧 Added winner-screen

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
+17 -8
View File
@@ -15,8 +15,8 @@ async def join_game(sid, data):
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session:
try: try:
async with session.post( async with session.post(
"https://hcaptcha.com/siteverify", "https://hcaptcha.com/siteverify",
data={"response": data["captcha"], "secret": settings.hcaptcha_key}, data={"response": data["captcha"], "secret": settings.hcaptcha_key},
) as resp: ) as resp:
resp_data = await resp.json() resp_data = await resp.json()
if not resp_data["success"]: if not resp_data["success"]:
@@ -156,9 +156,18 @@ async def submit_answer(sid, data):
@sio.event @sio.event
async def get_game_data(sid, _data): async def get_final_results(sid, _data):
game_pin = (await sio.get_session(sid))["game_pin"] session = await sio.get_session(sid)
game_data = await redis.get(f"game:{game_pin}") print(session)
if game_data is not None: game_data = PlayGame(**json.loads(await redis.get(f"game:{session['game_pin']}")))
await sio.emit("game_data", json.loads(game_data), room=game_pin) results = {}
# print(sid, data, "GET_GAME_DATA") if not session["admin"]:
return
for i in range(len(game_data.questions)):
redis_res = await redis.get(f"game_session:{session['game_pin']}:{i}")
print(redis_res)
if redis_res is None:
break
else:
results[str(i)] = json.loads(redis_res)
await sio.emit("final_results", results, room=session['game_pin'])
+4190 -3108
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -24,7 +24,7 @@ export class I18nService {
} }
// Initializing i18n // Initializing i18n
initialize(): void { initialize(): void {
this.i18n.use(LanguageDetector).init({ this.i18n.use(LanguageDetector).init({
// lng: INITIAL_LANGUAGE, // lng: INITIAL_LANGUAGE,
fallbackLng: 'en', fallbackLng: 'en',
@@ -50,7 +50,7 @@ export class I18nService {
this.i18n.addResourceBundle('fr', 'translation', fr); this.i18n.addResourceBundle('fr', 'translation', fr);
} }
changeLanguage(language: string): void { changeLanguage(language: string): void {
this.i18n.changeLanguage(language); this.i18n.changeLanguage(language);
} }
} }
+115 -115
View File
@@ -1,117 +1,117 @@
{ {
"index_page": { "index_page": {
"meta": { "meta": {
"title": "Home", "title": "Home",
"description": "ClassQuiz ist eine Quiz-App wie KAHOOT! für Schüler*innen, welche open-source und kostenlos ist" "description": "ClassQuiz ist eine Quiz-App wie KAHOOT! für Schüler*innen, welche open-source und kostenlos ist"
}, },
"features_description": { "features_description": {
"1": "ClassQuiz ist eine Quiz-Platform, welche das erstellen und managen von Quizzes erlaubt.", "1": "ClassQuiz ist eine Quiz-Platform, welche das erstellen und managen von Quizzes erlaubt.",
"2": "Das Hauptfeature ist die KAHOOT!-Importfunktion, mit der man Quizzes von KAHOOT! importieren kann." "2": "Das Hauptfeature ist die KAHOOT!-Importfunktion, mit der man Quizzes von KAHOOT! importieren kann."
}, },
"slogan": "Die open-source Quiz-Platform!" "slogan": "Die open-source Quiz-Platform!"
}, },
"overview_page": { "overview_page": {
"created_at": "Erstellt am", "created_at": "Erstellt am",
"question_count": "Fragenanzahl" "question_count": "Fragenanzahl"
}, },
"edit_page": { "edit_page": {
"success_update_title": "Quiz erfolgreich aktualisiert!", "success_update_title": "Quiz erfolgreich aktualisiert!",
"success_update_body": "Das Quiz wurde erfolgreich aktualisiert!" "success_update_body": "Das Quiz wurde erfolgreich aktualisiert!"
}, },
"create_page": { "create_page": {
"success": { "success": {
"title": "Quiz erfolgreich erstellt!", "title": "Quiz erfolgreich erstellt!",
"body": "Das Quiz wurde erfolgreich erstellt!" "body": "Das Quiz wurde erfolgreich erstellt!"
} }
}, },
"register_page": { "register_page": {
"greeting": "Schön, dich zu sehen!", "greeting": "Schön, dich zu sehen!",
"create_account": "Account erstellen", "create_account": "Account erstellen",
"forgot_password?": "Passwort vergessen?", "forgot_password?": "Passwort vergessen?",
"already_have_account?": "Hast du schon einen Account?" "already_have_account?": "Hast du schon einen Account?"
}, },
"login_page": { "login_page": {
"welcome_back": "Willkommen zurück!", "welcome_back": "Willkommen zurück!",
"login_or_create_account": "Einloggen oder Account erstellen", "login_or_create_account": "Einloggen oder Account erstellen",
"already_have_account": "Noch kein Account?", "already_have_account": "Noch kein Account?",
"modal": { "modal": {
"success": { "success": {
"success_check_mail": "Login erfolgreich! Guck in deine Mailbox!", "success_check_mail": "Login erfolgreich! Guck in deine Mailbox!",
"success": "Login erfolgreich!", "success": "Login erfolgreich!",
"description": { "description": {
"success_check_mail": "Bitte überprüfe deine Mailbox, weil du eine Email mit einem Link, um dich einzuloggen, empfangen haben solltest.", "success_check_mail": "Bitte überprüfe deine Mailbox, weil du eine Email mit einem Link, um dich einzuloggen, empfangen haben solltest.",
"success": "Du hast dich erfolgreich angemeldet!" "success": "Du hast dich erfolgreich angemeldet!"
} }
}, },
"error": { "error": {
"wrong_creds": "Falsche Email oder falsches Passwort!", "wrong_creds": "Falsche Email oder falsches Passwort!",
"unexpected": "Unerwarteter Fehler!", "unexpected": "Unerwarteter Fehler!",
"description": { "description": {
"wrong_creds": "Bitte stelle sicher, dass dein Passwort und deine Email richtig sind!", "wrong_creds": "Bitte stelle sicher, dass dein Passwort und deine Email richtig sind!",
"unexpected": "Der gute alte unerwartete Fehler hat uns heimgesucht!" "unexpected": "Der gute alte unerwartete Fehler hat uns heimgesucht!"
} }
} }
} }
}, },
"words": { "words": {
"question": "Frage", "question": "Frage",
"answer": "Antwort", "answer": "Antwort",
"stats": "Statistiken", "stats": "Statistiken",
"features": "Features", "features": "Features",
"import": "Importieren", "import": "Importieren",
"url": "URL", "url": "URL",
"submit": "Abschicken", "submit": "Abschicken",
"create": "Erstellen", "create": "Erstellen",
"logout": "Abmelden", "logout": "Abmelden",
"title": "Titel", "title": "Titel",
"play": "Spielen", "play": "Spielen",
"edit": "Bearbeiten", "edit": "Bearbeiten",
"delete": "Löschen", "delete": "Löschen",
"public": "Öffentlich", "public": "Öffentlich",
"start": "Start", "start": "Start",
"connect": "Verbinden", "connect": "Verbinden",
"pin": "PIN", "pin": "PIN",
"kick": "Kicken", "kick": "Kicken",
"register": "Registrieren", "register": "Registrieren",
"login": "Anmelden", "login": "Anmelden",
"docs": "Dokumentation", "docs": "Dokumentation",
"close": "Schließen", "close": "Schließen",
"save": "Speichern", "save": "Speichern",
"username": "Nutzername", "username": "Nutzername",
"password": "Passwort", "password": "Passwort",
"email": "Email", "email": "Email",
"description": "Beschreibung", "description": "Beschreibung",
"image": "Bild", "image": "Bild",
"settings": "Einstellungen", "settings": "Einstellungen",
"repeat_password": "Passwort wiederholen", "repeat_password": "Passwort wiederholen",
"overview": "Übersicht" "overview": "Übersicht"
}, },
"editor": { "editor": {
"time_in_seconds": "Zeit in Sekunden", "time_in_seconds": "Zeit in Sekunden",
"right_or_true?": "Richtig?", "right_or_true?": "Richtig?",
"add_new_answer": "Neue Antwort hinzufügen", "add_new_answer": "Neue Antwort hinzufügen",
"add_new_question": "Neue Frage hinzufügen", "add_new_question": "Neue Frage hinzufügen",
"delete_question": "Frage löschen", "delete_question": "Frage löschen",
"delete_answer": "Antwort löschen" "delete_answer": "Antwort löschen"
}, },
"import": { "import": {
"need_help": "", "need_help": "",
"visit_docs": "" "visit_docs": ""
}, },
"admin": { "admin": {
"already_registered_as_admin": "" "already_registered_as_admin": ""
}, },
"admin_page": { "admin_page": {
"already_registered_as_admin": "Ein Admin wurde schon für dieses Spiel registriert.", "already_registered_as_admin": "Ein Admin wurde schon für dieses Spiel registriert.",
"start_game": "Spiel starten", "start_game": "Spiel starten",
"time_left": "Zeit übrig", "time_left": "Zeit übrig",
"get_results": "Ergebnisse abfragen" "get_results": "Ergebnisse abfragen"
}, },
"import_page": { "import_page": {
"need_help": "Brauchst du Hilfe?", "need_help": "Brauchst du Hilfe?",
"visit_docs": "Besuche die Dokumentation" "visit_docs": "Besuche die Dokumentation"
}, },
"password_reset_page": { "password_reset_page": {
"reset_password": "Passwort zurücksetzen" "reset_password": "Passwort zurücksetzen"
} }
} }
+108 -108
View File
@@ -1,110 +1,110 @@
{ {
"index_page": { "index_page": {
"slogan": "The open-source quiz-platform!", "slogan": "The open-source quiz-platform!",
"meta": { "meta": {
"description": "ClassQuiz is a quiz app like KAHOOT! for students, which is open source and free to use", "description": "ClassQuiz is a quiz app like KAHOOT! for students, which is open source and free to use",
"title": "Home" "title": "Home"
}, },
"features_description": { "features_description": {
"1": "ClassQuiz is a quiz-platform that allows you to create and manage quizzes.", "1": "ClassQuiz is a quiz-platform that allows you to create and manage quizzes.",
"2": "The main feature is a KAHOOT!-import function that allows you to import quizzes from KAHOOT!-quizzes." "2": "The main feature is a KAHOOT!-import function that allows you to import quizzes from KAHOOT!-quizzes."
} }
}, },
"overview_page": { "overview_page": {
"created_at": "Created at", "created_at": "Created at",
"question_count": "Question count" "question_count": "Question count"
}, },
"edit_page": { "edit_page": {
"success_update_title": "Successfully updated quiz!", "success_update_title": "Successfully updated quiz!",
"success_update_body": "Updated the quiz successfully!" "success_update_body": "Updated the quiz successfully!"
}, },
"create_page": { "create_page": {
"success": { "success": {
"title": "Successfully created quiz!", "title": "Successfully created quiz!",
"body": "Created the quiz successfully!" "body": "Created the quiz successfully!"
} }
}, },
"register_page": { "register_page": {
"greeting": "Nice to meet you!", "greeting": "Nice to meet you!",
"create_account": "Create account", "create_account": "Create account",
"forgot_password?": "Forgot password?", "forgot_password?": "Forgot password?",
"already_have_account?": "Already have an account?" "already_have_account?": "Already have an account?"
}, },
"login_page": { "login_page": {
"welcome_back": "Welcome back!", "welcome_back": "Welcome back!",
"login_or_create_account": "Login or create an account", "login_or_create_account": "Login or create an account",
"already_have_account": "Don't have an account?", "already_have_account": "Don't have an account?",
"modal": { "modal": {
"success": { "success": {
"success_check_mail": "Login Succeded! Check your mailbox!", "success_check_mail": "Login Succeded! Check your mailbox!",
"success": "Login Succeded!", "success": "Login Succeded!",
"description": { "description": {
"success_check_mail": "Please check your mailbox, since you should have received a mail, with a link you can click to login.", "success_check_mail": "Please check your mailbox, since you should have received a mail, with a link you can click to login.",
"success": "You've successfully logged in!" "success": "You've successfully logged in!"
} }
}, },
"error": { "error": {
"wrong_creds": "Wrong email or password!", "wrong_creds": "Wrong email or password!",
"unexpected": "Unexpected error!", "unexpected": "Unexpected error!",
"description": { "description": {
"wrong_creds": "Please make sure that your password and your email are correct!", "wrong_creds": "Please make sure that your password and your email are correct!",
"unexpected": "There was the good old unexpected error!" "unexpected": "There was the good old unexpected error!"
} }
} }
} }
}, },
"words": { "words": {
"question": "Question", "question": "Question",
"answer": "Answer", "answer": "Answer",
"stats": "Stats", "stats": "Stats",
"features": "Features", "features": "Features",
"login": "Login", "login": "Login",
"email": "Email", "email": "Email",
"username": "Username", "username": "Username",
"password": "Password", "password": "Password",
"play": "Play", "play": "Play",
"edit": "Edit", "edit": "Edit",
"delete": "Delete", "delete": "Delete",
"public": "Public", "public": "Public",
"start": "Start", "start": "Start",
"create": "Create", "create": "Create",
"import": "Import", "import": "Import",
"logout": "Logout", "logout": "Logout",
"title": "Title", "title": "Title",
"url": "URL", "url": "URL",
"submit": "Submit", "submit": "Submit",
"connect": "Connect", "connect": "Connect",
"pin": "PIN", "pin": "PIN",
"kick": "Kick", "kick": "Kick",
"register": "Register", "register": "Register",
"docs": "Docs", "docs": "Docs",
"close": "Close", "close": "Close",
"save": "Save", "save": "Save",
"description": "Description", "description": "Description",
"image": "Image", "image": "Image",
"settings": "Settings", "settings": "Settings",
"repeat_password": "Repeat password", "repeat_password": "Repeat password",
"overview": "Overview" "overview": "Overview"
}, },
"editor": { "editor": {
"time_in_seconds": "Time in seconds", "time_in_seconds": "Time in seconds",
"right_or_true?": "Right?", "right_or_true?": "Right?",
"add_new_answer": "Add new answer", "add_new_answer": "Add new answer",
"add_new_question": "Add new question", "add_new_question": "Add new question",
"delete_question": "Delete question", "delete_question": "Delete question",
"delete_answer": "Delete answer" "delete_answer": "Delete answer"
}, },
"import_page": { "import_page": {
"need_help": "Need help?", "need_help": "Need help?",
"visit_docs": "Visit the documentation" "visit_docs": "Visit the documentation"
}, },
"admin_page": { "admin_page": {
"already_registered_as_admin": "There is already an admin registered for this game.", "already_registered_as_admin": "There is already an admin registered for this game.",
"start_game": "Start game", "start_game": "Start game",
"time_left": "Time left", "time_left": "Time left",
"get_results": "Get results" "get_results": "Get results"
}, },
"password_reset_page": { "password_reset_page": {
"reset_password": "Reset password" "reset_password": "Reset password"
} }
} }
+108 -108
View File
@@ -1,110 +1,110 @@
{ {
"login_page": { "login_page": {
"modal": { "modal": {
"success": { "success": {
"description": { "description": {
"success": "Vous vous êtes connecté avec succès !", "success": "Vous vous êtes connecté avec succès !",
"success_check_mail": "Veuillez vérifier votre boîte mail, vous avez normalement reçu un mail avec un lien pour vous connecter." "success_check_mail": "Veuillez vérifier votre boîte mail, vous avez normalement reçu un mail avec un lien pour vous connecter."
}, },
"success": "Connexion réussie !", "success": "Connexion réussie !",
"success_check_mail": "Connexion réussie! Vérifiez votre boîte mail!" "success_check_mail": "Connexion réussie! Vérifiez votre boîte mail!"
}, },
"error": { "error": {
"wrong_creds": "Mot de passe ou email non-correct !", "wrong_creds": "Mot de passe ou email non-correct !",
"description": { "description": {
"wrong_creds": "Assurez-vous que votre mot de passe et votre email sont corrects !", "wrong_creds": "Assurez-vous que votre mot de passe et votre email sont corrects !",
"unexpected": "Une bonne vieille erreur inattendue s'est produite !" "unexpected": "Une bonne vieille erreur inattendue s'est produite !"
}, },
"unexpected": "Erreur inattendue !" "unexpected": "Erreur inattendue !"
} }
}, },
"welcome_back": "Bon retour parmi nous!", "welcome_back": "Bon retour parmi nous!",
"login_or_create_account": "Se connecter ou créer un compte", "login_or_create_account": "Se connecter ou créer un compte",
"already_have_account": "Pas encore de compte ?" "already_have_account": "Pas encore de compte ?"
}, },
"words": { "words": {
"question": "Question", "question": "Question",
"answer": "Réponse", "answer": "Réponse",
"stats": "Statistiques", "stats": "Statistiques",
"features": "Fonctionnalités", "features": "Fonctionnalités",
"login": "Connexion", "login": "Connexion",
"email": "Email", "email": "Email",
"username": "Pseudo", "username": "Pseudo",
"password": "Mot de passe", "password": "Mot de passe",
"play": "Jouer", "play": "Jouer",
"edit": "Modifier", "edit": "Modifier",
"delete": "Supprimer", "delete": "Supprimer",
"public": "Public", "public": "Public",
"start": "Commencer", "start": "Commencer",
"create": "Créer", "create": "Créer",
"import": "Importer", "import": "Importer",
"logout": "Se déconnecter", "logout": "Se déconnecter",
"url": "URL", "url": "URL",
"submit": "Valider", "submit": "Valider",
"connect": "Connexion", "connect": "Connexion",
"pin": "PIN", "pin": "PIN",
"kick": "Éjecter", "kick": "Éjecter",
"register": "Enregistrer", "register": "Enregistrer",
"docs": "Documentation", "docs": "Documentation",
"close": "Fermer", "close": "Fermer",
"save": "Enregistrer", "save": "Enregistrer",
"description": "Description", "description": "Description",
"image": "Image", "image": "Image",
"title": "titre", "title": "titre",
"settings": "Paramètres", "settings": "Paramètres",
"repeat_password": "Répéter le mot de passe", "repeat_password": "Répéter le mot de passe",
"overview": "Vue d'ensemble" "overview": "Vue d'ensemble"
}, },
"index_page": { "index_page": {
"slogan": "La plateforme de quiz open-source !", "slogan": "La plateforme de quiz open-source !",
"meta": { "meta": {
"description": "ClassQuiz est une application de quiz comme KAHOOT! pour les étudiants, libre et open-source", "description": "ClassQuiz est une application de quiz comme KAHOOT! pour les étudiants, libre et open-source",
"title": "Accueil" "title": "Accueil"
}, },
"features_description": { "features_description": {
"1": "ClassQuiz est un outil de quiz vous permettant de créer et gérer des questionnaires.", "1": "ClassQuiz est un outil de quiz vous permettant de créer et gérer des questionnaires.",
"2": "La fonctionnalité principale est la fonction d'import de quiz KAHOOT, vou permettant de créer des quiz directement depuis KAHOOT!." "2": "La fonctionnalité principale est la fonction d'import de quiz KAHOOT, vou permettant de créer des quiz directement depuis KAHOOT!."
} }
}, },
"overview_page": { "overview_page": {
"created_at": "Crée le", "created_at": "Crée le",
"question_count": "Nombre de question" "question_count": "Nombre de question"
}, },
"edit_page": { "edit_page": {
"success_update_title": "Quiz mis à jour avec succès!", "success_update_title": "Quiz mis à jour avec succès!",
"success_update_body": "Quiz mis à jour avec succès !" "success_update_body": "Quiz mis à jour avec succès !"
}, },
"create_page": { "create_page": {
"success": { "success": {
"body": "Quiz créé avec succès !", "body": "Quiz créé avec succès !",
"title": "Quiz créé avec succès !" "title": "Quiz créé avec succès !"
} }
}, },
"register_page": { "register_page": {
"greeting": "Ravi de vous connaître !", "greeting": "Ravi de vous connaître !",
"create_account": "Créer un compte", "create_account": "Créer un compte",
"forgot_password?": "Mot de passe oublié ?", "forgot_password?": "Mot de passe oublié ?",
"already_have_account?": "Vous avez déjà un compte ?" "already_have_account?": "Vous avez déjà un compte ?"
}, },
"editor": { "editor": {
"time_in_seconds": "Temps en seconde", "time_in_seconds": "Temps en seconde",
"add_new_question": "Ajouter une autre question", "add_new_question": "Ajouter une autre question",
"add_new_answer": "Ajouter une autre réponse", "add_new_answer": "Ajouter une autre réponse",
"delete_question": "Supprimer la question", "delete_question": "Supprimer la question",
"delete_answer": "Supprimer la réponse", "delete_answer": "Supprimer la réponse",
"right_or_true?": "Vrai?" "right_or_true?": "Vrai?"
}, },
"import_page": { "import_page": {
"need_help": "Besoin d'aide ?", "need_help": "Besoin d'aide ?",
"visit_docs": "Voir la documentation" "visit_docs": "Voir la documentation"
}, },
"admin_page": { "admin_page": {
"already_registered_as_admin": "Il y a déjà un administrateur enregistré pour ce jeu.", "already_registered_as_admin": "Il y a déjà un administrateur enregistré pour ce jeu.",
"start_game": "Commencer le jeu", "start_game": "Commencer le jeu",
"time_left": "Temps restant", "time_left": "Temps restant",
"get_results": "Obtenir les résultats" "get_results": "Obtenir les résultats"
}, },
"password_reset_page": { "password_reset_page": {
"reset_password": "Réinitialiser le mot de passe" "reset_password": "Réinitialiser le mot de passe"
} }
} }
+76
View File
@@ -0,0 +1,76 @@
<script lang="ts">
import type { QuizData } from '../../app';
export let quiz_data: QuizData;
export let final_results: Array<null> | Array<Array<PlayerAnswer>>;
interface PlayerAnswer {
username: string;
answer: string;
right: string;
}
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);
};
let winners = getWinnersSorted();
let winners_arr = Object.keys(winners);
console.log(winners);
</script>
<div>
<h1 class="mx-auto text-center text-6xl mt-8">That's it! This was the quiz.</h1>
<div class="flex mx-auto w-fit flex-col pt-8 gap-2">
<div>
<p class="text-3xl text-center">
1st Place: <span class="underline">{winners_arr[0]}</span>
<span>with {winners[winners_arr[0]]} out of {quiz_data.questions.length}</span>
</p>
</div>
{#if winners_arr.length >= 2}
<div>
<p class="text-2xl text-center">
2nd Place: <span class="underline">{winners_arr[1]}</span>
<span>with {winners[winners_arr[1]]} out of {quiz_data.questions.length}</span>
</p>
</div>
{/if}
{#if winners_arr.length >= 3}
<div>
<p class="text-xl text-center">
2nd Place: <span class="underline">{winners_arr[3]}</span><span
>With {winners[winners_arr[3]]}</span
>
</p>
</div>
{/if}
</div>
</div>
+2 -1
View File
@@ -46,7 +46,8 @@
const { response } = await hcaptcha.execute(hcaptchaWidgetID, { const { response } = await hcaptcha.execute(hcaptchaWidgetID, {
async: true async: true
}); });
captcha_resp = response; captcha_resp = response
captcha_resp = '';
} catch (e) { } catch (e) {
if (import.meta.env.VITE_SENTRY !== null) { if (import.meta.env.VITE_SENTRY !== null) {
Sentry.captureException(e); Sentry.captureException(e);
@@ -6,7 +6,6 @@
export let question_index: string; export let question_index: string;
let data_store = {}; let data_store = {};
const question = game_data.questions[parseInt(question_index)].answers; const question = game_data.questions[parseInt(question_index)].answers;
for (let i = 0; i < question.length; i++) { for (let i = 0; i < question.length; i++) {
console.log(question[i].answer, 'HI!!!'); console.log(question[i].answer, 'HI!!!');
+1 -1
View File
@@ -9,7 +9,7 @@
initLocalizationContext(); initLocalizationContext();
if (import.meta.env.VITE_SENTRY !== undefined) { if (import.meta.env.VITE_SENTRY !== undefined) {
console.log(import.meta.env.VITE_SENTRY) console.log(import.meta.env.VITE_SENTRY);
Sentry.init({ Sentry.init({
dsn: String(import.meta.env.VITE_SENTRY), dsn: String(import.meta.env.VITE_SENTRY),
integrations: [new BrowserTracing()], integrations: [new BrowserTracing()],
@@ -10,7 +10,7 @@
} }
</script> </script>
<script lang='ts'> <script lang="ts">
import { getLocalization } from '../../lib/i18n'; import { getLocalization } from '../../lib/i18n';
const { t } = getLocalization(); const { t } = getLocalization();
@@ -20,7 +20,7 @@
password1: string; password1: string;
password2: string; password2: string;
} }
let passwordData: PasswordData = { let passwordData: PasswordData = {
password1: '', password1: '',
password2: '' password2: ''
}; };
@@ -55,7 +55,7 @@
}; };
</script> </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>
<div <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"
@@ -126,7 +126,7 @@
type="submit" type="submit"
> >
{#if isSubmitting} {#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 <path
class="fill-black" 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" 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"
+21 -21
View File
@@ -28,9 +28,9 @@
} }
interface ChangePasswordData { interface ChangePasswordData {
oldPassword: string, oldPassword: string;
newPassword: string, newPassword: string;
newPasswordConfirm: string newPasswordConfirm: string;
} }
let changePasswordData: ChangePasswordData = { let changePasswordData: ChangePasswordData = {
@@ -107,32 +107,32 @@
/> />
</div> </div>
<div> <div>
<h1 class='text-slate-100 text-4xl font-bold my-2'>{user.username}</h1> <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'> <p class="text-slate-100 text-lg mb-6 md:max-w-lg">
{$t('words.email')}: {user.email} {$t('words.email')}: {user.email}
</p> </p>
<!-- TODO: Add translation --> <!-- 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 <label
>Old Password:<input >Old Password:<input
type='password' type="password"
class='m-2 text-black' class="m-2 text-black"
bind:value={changePasswordData.oldPassword} bind:value={changePasswordData.oldPassword}
/></label /></label
> >
<label <label
>New Password:<input >New Password:<input
type='password' type="password"
class='m-2 text-black' class="m-2 text-black"
bind:value={changePasswordData.newPassword} bind:value={changePasswordData.newPassword}
/></label /></label
> >
<label <label
>New Password again:<input >New Password again:<input
type='password' type="password"
class='m-2 text-black' class="m-2 text-black"
bind:value={changePasswordData.newPasswordConfirm} bind:value={changePasswordData.newPasswordConfirm}
/></label /></label
> >
<button <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" 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"
+54 -1
View File
@@ -41,15 +41,24 @@
export let auto_connect: boolean; export let auto_connect: boolean;
export let game_token: string; export let game_token: string;
let success = false; let success = false;
interface Player { interface Player {
username: string username: string;
} }
interface PlayerAnswer {
username: string;
answer: string;
right: string;
}
let players: Array<Player> = []; let players: Array<Player> = [];
let errorMessage = ''; let errorMessage = '';
let game_started = false; let game_started = false;
let quiz_data: QuizData; let quiz_data: QuizData;
//let question_number = '0'; //let question_number = '0';
let question_results = null; let question_results = null;
let final_results: Array<null> | Array<Array<PlayerAnswer>> = [null];
let shown_question_now: number; let shown_question_now: number;
const connect = () => { 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) => { socket.on('question_results', (data) => {
data = JSON.parse(data); data = JSON.parse(data);
console.log(data); console.log(data);
question_results = 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) => { const timer = (time: string) => {
let seconds = Number(time); let seconds = Number(time);
let timer_interval = setInterval(() => { let timer_interval = setInterval(() => {
@@ -173,4 +225,5 @@
> >
<br /> <br />
{/each} {/each}
<button on:click={get_final_results}>Get final results</button>
{/if} {/if}
+125 -125
View File
@@ -1,4 +1,4 @@
<script context='module' lang='ts'> <script context="module" lang="ts">
export async function load({ session }) { export async function load({ session }) {
if (!session.authenticated) { if (!session.authenticated) {
return { return {
@@ -14,7 +14,7 @@
} }
</script> </script>
<script lang='ts'> <script lang="ts">
import type { Question } from '../app'; import type { Question } from '../app';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import { getLocalization } from '$lib/i18n'; import { getLocalization } from '$lib/i18n';
@@ -74,161 +74,161 @@
<title>ClassQuiz - Overview</title> <title>ClassQuiz - Overview</title>
</svelte:head> </svelte:head>
<div class='min-h-screen flex flex-col'> <div class="min-h-screen flex flex-col">
{#await getData()} {#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 <path
class='fill-black' 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' 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 <path
class='fill-blue-100' 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' 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> </svg>
{:then quizzes} {:then quizzes}
<div class='flex flex-col w-fit mx-auto'> <div class="flex flex-col w-fit mx-auto">
<!-- <button <!-- <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'> 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 Primary
</button>--> </button>-->
<div class='w-full grid grid-cols-4 gap-2'> <div class="w-full grid grid-cols-4 gap-2">
<a <a
href='/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' 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')} >{$t('words.create')}
</a> </a>
<a <a
href='/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' 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')} >{$t('words.import')}
</a> </a>
<a <a
href='/api/v1/users/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' 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')} >{$t('words.logout')}
</a> </a>
<a <a
href='/account/settings' 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' 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')} {$t('words.settings')}
</a> </a>
</div> </div>
<div class='overflow-x-auto sm:-mx-8 lg:-mx-8'> <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="inline-block py-2 min-w-full sm:px-6 lg:px-8">
<div class='overflow-hidden shadow-md sm:rounded-lg'> <div class="overflow-hidden shadow-md sm:rounded-lg">
<table class='min-w-full'> <table class="min-w-full">
<thead class='bg-gray-50 dark:bg-gray-700'> <thead class="bg-gray-50 dark:bg-gray-700">
<tr> <tr>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
> >
{$t('words.title')} {$t('words.title')}
</th> </th>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' 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')} {$t('overview_page.created_at')}
</th> </th>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' 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')} {$t('overview_page.question_count')}
</th> </th>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
> >
{$t('words.play')} {$t('words.play')}
</th> </th>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
> >
{$t('words.edit')} {$t('words.edit')}
</th> </th>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
> >
{$t('words.delete')} {$t('words.delete')}
</th> </th>
<th <th
scope='col' scope="col"
class='py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400' class="py-3 px-6 text-xs font-medium tracking-wider text-left text-gray-700 uppercase dark:text-gray-400"
> >
{$t('words.public')} {$t('words.public')}
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{#each quizzes as quiz} {#each quizzes as quiz}
<tr <tr
class='bg-white border-b dark:bg-gray-800 dark:border-gray-700' 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'
> >
{quiz.title} <td
</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 text-gray-500 whitespace-nowrap dark:text-gray-400' {quiz.title}
> </td>
{formatDate(quiz.created_at)} <td
</td> class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
<td >
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400' {formatDate(quiz.created_at)}
> </td>
{quiz.questions.length} <td
</td> class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
<td >
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400' {quiz.questions.length}
> </td>
<button <td
on:click={() => { class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
>
<button
on:click={() => {
startGame(quiz.id); 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')} <a
</button> href="/edit?quiz_id={quiz.id}"
</td> class="border border-yellow-600"
<td >{$t('words.edit')}</a
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400' >
> </td>
<a <td
href='/edit?quiz_id={quiz.id}' class="py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400"
class='border border-yellow-600'
>{$t('words.edit')}</a
> >
</td> <button
<td on:click={() => {
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400'
>
<button
on:click={() => {
deleteQuiz(quiz.id); 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')} {#if quiz.public}
</button>
</td> {:else}
<td
class='py-4 px-6 text-sm text-gray-500 whitespace-nowrap dark:text-gray-400' {/if}
> </td>
{#if quiz.public} </tr>
{/each}
{:else}
{/if}
</td>
</tr>
{/each}
</tbody> </tbody>
</table> </table>
</div> </div>
+20 -4
View File
@@ -1,4 +1,4 @@
<script context='module' lang='ts'> <script context="module" lang="ts">
import { signedIn } from '$lib/stores'; import { signedIn } from '$lib/stores';
export async function load({ url, session }) { export async function load({ url, session }) {
@@ -14,7 +14,7 @@
} }
</script> </script>
<script lang='ts'> <script lang="ts">
import { socket } from '$lib/socket'; import { socket } from '$lib/socket';
import JoinGame from '$lib/play/join.svelte'; import JoinGame from '$lib/play/join.svelte';
import type { Answer, QuizData } from '../app'; import type { Answer, QuizData } from '../app';
@@ -22,6 +22,7 @@
import Question from '$lib/play/question.svelte'; import Question from '$lib/play/question.svelte';
import ShowResults from '$lib/play/show_results.svelte'; import ShowResults from '$lib/play/show_results.svelte';
import { navbarVisible } from '$lib/stores'; import { navbarVisible } from '$lib/stores';
import ShowEndScreen from '$lib/play/end.svelte';
// Exports // Exports
export let game_pin: string; export let game_pin: string;
@@ -31,8 +32,16 @@
started: boolean; started: boolean;
} }
let final_results: Array<null> | Array<Array<PlayerAnswer>> = [null];
interface PlayerAnswer {
username: string;
answer: string;
right: string;
}
// Variables init // Variables init
let question_index: string = ''; let question_index = '';
let unique = {}; let unique = {};
navbarVisible.set(false); navbarVisible.set(false);
let game_pin_valid: boolean; let game_pin_valid: boolean;
@@ -72,7 +81,12 @@
restart(); restart();
answer_results = JSON.parse(data); answer_results = JSON.parse(data);
}); });
socket.on('final_results', (data) => {
final_results = data;
});
// The rest // The rest
console.log(final_results, JSON.stringify(final_results) !== JSON.stringify([null]));
</script> </script>
<svelte:head> <svelte:head>
@@ -80,7 +94,7 @@
{#if gameData !== undefined} {#if gameData !== undefined}
{#each gameData.questions as question} {#each gameData.questions as question}
{#if question.image !== undefined} {#if question.image !== undefined}
<link rel='preload' as='image' href={question.image} /> <link rel="preload" as="image" href={question.image} />
{/if} {/if}
{/each} {/each}
{/if} {/if}
@@ -88,6 +102,8 @@
<div> <div>
{#if !gameMeta.started && gameData === undefined} {#if !gameMeta.started && gameData === undefined}
<JoinGame {game_pin} /> <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 === ''} {:else if gameData !== undefined && question_index === ''}
<ShowTitle bind:title={gameData.title} bind:description={gameData.description} /> <ShowTitle bind:title={gameData.title} bind:description={gameData.description} />
{:else if gameMeta.started && gameData !== undefined && question_index !== '' && answer_results === undefined} {:else if gameMeta.started && gameData !== undefined && question_index !== '' && answer_results === undefined}