From 411064967f095fcb1e04cf70dd402549771fd7ef Mon Sep 17 00:00:00 2001 From: Mawoka Date: Sat, 9 Apr 2022 09:30:19 +0200 Subject: [PATCH 01/26] :bug: Fixed navbar #11 --- frontend/src/lib/i18n/locales/de.json | 228 +++++++++--------- frontend/src/lib/i18n/locales/en.json | 214 ++++++++-------- frontend/src/lib/i18n/locales/fr.json | 214 ++++++++-------- frontend/src/routes/account/__layout.svelte | 7 + .../src/routes/account/password-reset.svelte | 90 ++++--- .../src/routes/account/reset-password.svelte | 73 +++--- frontend/src/routes/account/settings.svelte | 67 +++-- frontend/src/routes/admin.svelte | 3 + frontend/src/routes/create.svelte | 3 + frontend/src/routes/debug.svelte | 3 + frontend/src/routes/docs/__layout.svelte | 3 + frontend/src/routes/edit.svelte | 3 + frontend/src/routes/import.svelte | 3 + frontend/src/routes/overview.svelte | 9 +- 14 files changed, 479 insertions(+), 441 deletions(-) create mode 100644 frontend/src/routes/account/__layout.svelte diff --git a/frontend/src/lib/i18n/locales/de.json b/frontend/src/lib/i18n/locales/de.json index 14ec70a..4afbf9c 100644 --- a/frontend/src/lib/i18n/locales/de.json +++ b/frontend/src/lib/i18n/locales/de.json @@ -1,116 +1,116 @@ { - "index_page": { - "meta": { - "title": "Home", - "description": "ClassQuiz ist eine Quiz-App wie KAHOOT! für Schüler*innen, welche open-source und kostenlos ist" - }, - "features_description": { - "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." - }, - "slogan": "Die open-source Quiz-Platform!" - }, - "overview_page": { - "created_at": "Erstellt am", - "question_count": "Fragenanzahl" - }, - "edit_page": { - "success_update_title": "Quiz erfolgreich aktualisiert!", - "success_update_body": "Das Quiz wurde erfolgreich aktualisiert!" - }, - "create_page": { - "success": { - "title": "Quiz erfolgreich erstellt!", - "body": "Das Quiz wurde erfolgreich erstellt!" - } - }, - "register_page": { - "greeting": "Schön, dich zu sehen!", - "create_account": "Account erstellen", - "forgot_password?": "Passwort vergessen?", - "already_have_account?": "Hast du schon einen Account?" - }, - "login_page": { - "welcome_back": "Willkommen zurück!", - "login_or_create_account": "Einloggen oder Account erstellen", - "already_have_account": "Noch kein Account?", - "modal": { - "success": { - "success_check_mail": "Login erfolgreich! Guck in deine Mailbox!", - "success": "Login erfolgreich!", - "description": { - "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!" - } - }, - "error": { - "wrong_creds": "Falsche Email oder falsches Passwort!", - "unexpected": "Unerwarteter Fehler!", - "description": { - "wrong_creds": "Bitte stelle sicher, dass dein Passwort und deine Email richtig sind!", - "unexpected": "Der gute alte unerwartete Fehler hat uns heimgesucht!" - } - } - } - }, - "words": { - "question": "Frage", - "answer": "Antwort", - "stats": "Statistiken", - "features": "Features", - "import": "Importieren", - "url": "URL", - "submit": "Abschicken", - "create": "Erstellen", - "logout": "Abmelden", - "title": "Titel", - "play": "Spielen", - "edit": "Bearbeiten", - "delete": "Löschen", - "public": "Öffentlich", - "start": "Start", - "connect": "Verbinden", - "pin": "PIN", - "kick": "Kicken", - "register": "Registrieren", - "login": "Anmelden", - "docs": "Dokumentation", - "close": "Schließen", - "save": "Speichern", - "username": "Nutzername", - "password": "Passwort", - "email": "Email", - "description": "Beschreibung", - "image": "Bild", - "settings": "Einstellungen", - "repeat_password": "Passwort wiederholen" - }, - "editor": { - "time_in_seconds": "Zeit in Sekunden", - "right_or_true?": "Richtig?", - "add_new_answer": "Neue Antwort hinzufügen", - "add_new_question": "Neue Frage hinzufügen", - "delete_question": "Frage löschen", - "delete_answer": "Antwort löschen" - }, - "import": { - "need_help": "", - "visit_docs": "" - }, - "admin": { - "already_registered_as_admin": "" - }, - "admin_page": { - "already_registered_as_admin": "Ein Admin wurde schon für dieses Spiel registriert.", - "start_game": "Spiel starten", - "time_left": "Zeit übrig", - "get_results": "Ergebnisse abfragen" - }, - "import_page": { - "need_help": "Brauchst du Hilfe?", - "visit_docs": "Besuche die Dokumentation" - }, - "password_reset_page": { - "reset_password": "Passwort zurücksetzen" - } + "index_page": { + "meta": { + "title": "Home", + "description": "ClassQuiz ist eine Quiz-App wie KAHOOT! für Schüler*innen, welche open-source und kostenlos ist" + }, + "features_description": { + "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." + }, + "slogan": "Die open-source Quiz-Platform!" + }, + "overview_page": { + "created_at": "Erstellt am", + "question_count": "Fragenanzahl" + }, + "edit_page": { + "success_update_title": "Quiz erfolgreich aktualisiert!", + "success_update_body": "Das Quiz wurde erfolgreich aktualisiert!" + }, + "create_page": { + "success": { + "title": "Quiz erfolgreich erstellt!", + "body": "Das Quiz wurde erfolgreich erstellt!" + } + }, + "register_page": { + "greeting": "Schön, dich zu sehen!", + "create_account": "Account erstellen", + "forgot_password?": "Passwort vergessen?", + "already_have_account?": "Hast du schon einen Account?" + }, + "login_page": { + "welcome_back": "Willkommen zurück!", + "login_or_create_account": "Einloggen oder Account erstellen", + "already_have_account": "Noch kein Account?", + "modal": { + "success": { + "success_check_mail": "Login erfolgreich! Guck in deine Mailbox!", + "success": "Login erfolgreich!", + "description": { + "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!" + } + }, + "error": { + "wrong_creds": "Falsche Email oder falsches Passwort!", + "unexpected": "Unerwarteter Fehler!", + "description": { + "wrong_creds": "Bitte stelle sicher, dass dein Passwort und deine Email richtig sind!", + "unexpected": "Der gute alte unerwartete Fehler hat uns heimgesucht!" + } + } + } + }, + "words": { + "question": "Frage", + "answer": "Antwort", + "stats": "Statistiken", + "features": "Features", + "import": "Importieren", + "url": "URL", + "submit": "Abschicken", + "create": "Erstellen", + "logout": "Abmelden", + "title": "Titel", + "play": "Spielen", + "edit": "Bearbeiten", + "delete": "Löschen", + "public": "Öffentlich", + "start": "Start", + "connect": "Verbinden", + "pin": "PIN", + "kick": "Kicken", + "register": "Registrieren", + "login": "Anmelden", + "docs": "Dokumentation", + "close": "Schließen", + "save": "Speichern", + "username": "Nutzername", + "password": "Passwort", + "email": "Email", + "description": "Beschreibung", + "image": "Bild", + "settings": "Einstellungen", + "repeat_password": "Passwort wiederholen" + }, + "editor": { + "time_in_seconds": "Zeit in Sekunden", + "right_or_true?": "Richtig?", + "add_new_answer": "Neue Antwort hinzufügen", + "add_new_question": "Neue Frage hinzufügen", + "delete_question": "Frage löschen", + "delete_answer": "Antwort löschen" + }, + "import": { + "need_help": "", + "visit_docs": "" + }, + "admin": { + "already_registered_as_admin": "" + }, + "admin_page": { + "already_registered_as_admin": "Ein Admin wurde schon für dieses Spiel registriert.", + "start_game": "Spiel starten", + "time_left": "Zeit übrig", + "get_results": "Ergebnisse abfragen" + }, + "import_page": { + "need_help": "Brauchst du Hilfe?", + "visit_docs": "Besuche die Dokumentation" + }, + "password_reset_page": { + "reset_password": "Passwort zurücksetzen" + } } diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json index 531db26..1ac8127 100644 --- a/frontend/src/lib/i18n/locales/en.json +++ b/frontend/src/lib/i18n/locales/en.json @@ -1,109 +1,109 @@ { - "index_page": { - "slogan": "The open-source quiz-platform!", - "meta": { - "description": "ClassQuiz is a quiz app like KAHOOT! for students, which is open source and free to use", - "title": "Home" - }, - "features_description": { - "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." - } - }, - "overview_page": { - "created_at": "Created at", - "question_count": "Question count" - }, - "edit_page": { - "success_update_title": "Successfully updated quiz!", - "success_update_body": "Updated the quiz successfully!" - }, - "create_page": { - "success": { - "title": "Successfully created quiz!", - "body": "Created the quiz successfully!" - } - }, - "register_page": { - "greeting": "Nice to meet you!", - "create_account": "Create account", - "forgot_password?": "Forgot password?", - "already_have_account?": "Already have an account?" - }, - "login_page": { - "welcome_back": "Welcome back!", - "login_or_create_account": "Login or create an account", - "already_have_account": "Don't have an account?", - "modal": { - "success": { - "success_check_mail": "Login Succeded! Check your mailbox!", - "success": "Login Succeded!", - "description": { - "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!" - } - }, - "error": { - "wrong_creds": "Wrong email or password!", - "unexpected": "Unexpected error!", - "description": { - "wrong_creds": "Please make sure that your password and your email are correct!", - "unexpected": "There was the good old unexpected error!" - } - } - } - }, - "words": { - "question": "Question", - "answer": "Answer", - "stats": "Stats", - "features": "Features", - "login": "Login", - "email": "Email", - "username": "Username", - "password": "Password", - "play": "Play", - "edit": "Edit", - "delete": "Delete", - "public": "Public", - "start": "Start", - "create": "Create", - "import": "Import", - "logout": "Logout", - "title": "Title", - "url": "URL", - "submit": "Submit", - "connect": "Connect", - "pin": "PIN", - "kick": "Kick", - "register": "Register", - "docs": "Docs", - "close": "Close", - "save": "Save", - "description": "Description", - "image": "Image", - "settings": "Settings", - "repeat_password": "Repeat password" - }, - "editor": { - "time_in_seconds": "Time in seconds", - "right_or_true?": "Right?", - "add_new_answer": "Add new answer", - "add_new_question": "Add new question", - "delete_question": "Delete question", - "delete_answer": "Delete answer" - }, - "import_page": { - "need_help": "Need help?", - "visit_docs": "Visit the documentation" - }, - "admin_page": { - "already_registered_as_admin": "There is already an admin registered for this game.", - "start_game": "Start game", - "time_left": "Time left", - "get_results": "Get results" - }, - "password_reset_page": { - "reset_password": "Reset password" - } + "index_page": { + "slogan": "The open-source quiz-platform!", + "meta": { + "description": "ClassQuiz is a quiz app like KAHOOT! for students, which is open source and free to use", + "title": "Home" + }, + "features_description": { + "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." + } + }, + "overview_page": { + "created_at": "Created at", + "question_count": "Question count" + }, + "edit_page": { + "success_update_title": "Successfully updated quiz!", + "success_update_body": "Updated the quiz successfully!" + }, + "create_page": { + "success": { + "title": "Successfully created quiz!", + "body": "Created the quiz successfully!" + } + }, + "register_page": { + "greeting": "Nice to meet you!", + "create_account": "Create account", + "forgot_password?": "Forgot password?", + "already_have_account?": "Already have an account?" + }, + "login_page": { + "welcome_back": "Welcome back!", + "login_or_create_account": "Login or create an account", + "already_have_account": "Don't have an account?", + "modal": { + "success": { + "success_check_mail": "Login Succeded! Check your mailbox!", + "success": "Login Succeded!", + "description": { + "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!" + } + }, + "error": { + "wrong_creds": "Wrong email or password!", + "unexpected": "Unexpected error!", + "description": { + "wrong_creds": "Please make sure that your password and your email are correct!", + "unexpected": "There was the good old unexpected error!" + } + } + } + }, + "words": { + "question": "Question", + "answer": "Answer", + "stats": "Stats", + "features": "Features", + "login": "Login", + "email": "Email", + "username": "Username", + "password": "Password", + "play": "Play", + "edit": "Edit", + "delete": "Delete", + "public": "Public", + "start": "Start", + "create": "Create", + "import": "Import", + "logout": "Logout", + "title": "Title", + "url": "URL", + "submit": "Submit", + "connect": "Connect", + "pin": "PIN", + "kick": "Kick", + "register": "Register", + "docs": "Docs", + "close": "Close", + "save": "Save", + "description": "Description", + "image": "Image", + "settings": "Settings", + "repeat_password": "Repeat password" + }, + "editor": { + "time_in_seconds": "Time in seconds", + "right_or_true?": "Right?", + "add_new_answer": "Add new answer", + "add_new_question": "Add new question", + "delete_question": "Delete question", + "delete_answer": "Delete answer" + }, + "import_page": { + "need_help": "Need help?", + "visit_docs": "Visit the documentation" + }, + "admin_page": { + "already_registered_as_admin": "There is already an admin registered for this game.", + "start_game": "Start game", + "time_left": "Time left", + "get_results": "Get results" + }, + "password_reset_page": { + "reset_password": "Reset password" + } } diff --git a/frontend/src/lib/i18n/locales/fr.json b/frontend/src/lib/i18n/locales/fr.json index 1f9a818..1b06ecb 100644 --- a/frontend/src/lib/i18n/locales/fr.json +++ b/frontend/src/lib/i18n/locales/fr.json @@ -1,109 +1,109 @@ { - "login_page": { - "modal": { - "success": { - "description": { - "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": "Connexion réussie !", - "success_check_mail": "Connexion réussie ! Vérifiez votre boîte mail !" - }, - "error": { - "wrong_creds": "Mot de passe ou email non-correct !", - "description": { - "wrong_creds": "Assurez-vous que votre mot de passe et votre email sont corrects !", - "unexpected": "Une bonne vieille erreur inattendue s'est produite !" - }, - "unexpected": "Erreur inattendue !" - } - }, - "welcome_back": "Bon retour parmi nous !", - "login_or_create_account": "Se connecter ou créer un compte", - "already_have_account": "Pas encore de compte ?" - }, - "words": { - "question": "Question", - "answer": "Réponse", - "stats": "Statistiques", - "features": "Fonctionnalités", - "login": "Connexion", - "email": "Email", - "username": "Pseudo", - "password": "Mot de passe", - "play": "Jouer", - "edit": "Modifier", - "delete": "Supprimer", - "public": "Public", - "start": "Commencer", - "create": "Créer", - "import": "Importer", - "logout": "Se déconnecter", - "url": "URL", - "submit": "Valider", - "connect": "Connexion", - "pin": "PIN", - "kick": "Éjecter", - "register": "Enregistrer", - "docs": "Documentation", - "close": "Fermer", - "save": "Enregistrer", - "description": "Description", - "image": "Image", - "title": "titre", - "settings": "Paramètres", - "repeat_password": "" - }, - "index_page": { - "slogan": "La plateforme de quiz open-source !", - "meta": { - "description": "ClassQuiz est une application de quiz comme KAHOOT! pour les étudiants, libre et open-source", - "title": "Accueil" - }, - "features_description": { - "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!." - } - }, - "overview_page": { - "created_at": "Crée le", - "question_count": "Nombre de question" - }, - "edit_page": { - "success_update_title": "Quiz mis à jour avec succès !", - "success_update_body": "Quiz mis à jour avec succès !" - }, - "create_page": { - "success": { - "body": "Quiz créé avec succès !", - "title": "Quiz créé avec succès !" - } - }, - "register_page": { - "greeting": "Ravi de vous connaître !", - "create_account": "Créer un compte", - "forgot_password?": "Mot de passe oublié ?", - "already_have_account?": "Vous avez déjà un compte ?" - }, - "editor": { - "time_in_seconds": "Temps en seconde", - "add_new_question": "Ajouter une autre question", - "add_new_answer": "Ajouter une autre réponse", - "delete_question": "Supprimer la question", - "delete_answer": "Supprimer la réponse", - "right_or_true?": "Vrai?" - }, - "import_page": { - "need_help": "Besoin d'aide ?", - "visit_docs": "Voir la documentation" - }, - "admin_page": { - "already_registered_as_admin": "Il y a déjà un administrateur enregistré pour ce jeu.", - "start_game": "Commencer le jeu", - "time_left": "Temps restant", - "get_results": "Obtenir les résultats" - }, - "password_reset_page": { - "reset_password": "" - } + "login_page": { + "modal": { + "success": { + "description": { + "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": "Connexion réussie !", + "success_check_mail": "Connexion réussie ! Vérifiez votre boîte mail !" + }, + "error": { + "wrong_creds": "Mot de passe ou email non-correct !", + "description": { + "wrong_creds": "Assurez-vous que votre mot de passe et votre email sont corrects !", + "unexpected": "Une bonne vieille erreur inattendue s'est produite !" + }, + "unexpected": "Erreur inattendue !" + } + }, + "welcome_back": "Bon retour parmi nous !", + "login_or_create_account": "Se connecter ou créer un compte", + "already_have_account": "Pas encore de compte ?" + }, + "words": { + "question": "Question", + "answer": "Réponse", + "stats": "Statistiques", + "features": "Fonctionnalités", + "login": "Connexion", + "email": "Email", + "username": "Pseudo", + "password": "Mot de passe", + "play": "Jouer", + "edit": "Modifier", + "delete": "Supprimer", + "public": "Public", + "start": "Commencer", + "create": "Créer", + "import": "Importer", + "logout": "Se déconnecter", + "url": "URL", + "submit": "Valider", + "connect": "Connexion", + "pin": "PIN", + "kick": "Éjecter", + "register": "Enregistrer", + "docs": "Documentation", + "close": "Fermer", + "save": "Enregistrer", + "description": "Description", + "image": "Image", + "title": "titre", + "settings": "Paramètres", + "repeat_password": "" + }, + "index_page": { + "slogan": "La plateforme de quiz open-source !", + "meta": { + "description": "ClassQuiz est une application de quiz comme KAHOOT! pour les étudiants, libre et open-source", + "title": "Accueil" + }, + "features_description": { + "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!." + } + }, + "overview_page": { + "created_at": "Crée le", + "question_count": "Nombre de question" + }, + "edit_page": { + "success_update_title": "Quiz mis à jour avec succès !", + "success_update_body": "Quiz mis à jour avec succès !" + }, + "create_page": { + "success": { + "body": "Quiz créé avec succès !", + "title": "Quiz créé avec succès !" + } + }, + "register_page": { + "greeting": "Ravi de vous connaître !", + "create_account": "Créer un compte", + "forgot_password?": "Mot de passe oublié ?", + "already_have_account?": "Vous avez déjà un compte ?" + }, + "editor": { + "time_in_seconds": "Temps en seconde", + "add_new_question": "Ajouter une autre question", + "add_new_answer": "Ajouter une autre réponse", + "delete_question": "Supprimer la question", + "delete_answer": "Supprimer la réponse", + "right_or_true?": "Vrai?" + }, + "import_page": { + "need_help": "Besoin d'aide ?", + "visit_docs": "Voir la documentation" + }, + "admin_page": { + "already_registered_as_admin": "Il y a déjà un administrateur enregistré pour ce jeu.", + "start_game": "Commencer le jeu", + "time_left": "Temps restant", + "get_results": "Obtenir les résultats" + }, + "password_reset_page": { + "reset_password": "" + } } diff --git a/frontend/src/routes/account/__layout.svelte b/frontend/src/routes/account/__layout.svelte new file mode 100644 index 0000000..c5d1b81 --- /dev/null +++ b/frontend/src/routes/account/__layout.svelte @@ -0,0 +1,7 @@ + + + diff --git a/frontend/src/routes/account/password-reset.svelte b/frontend/src/routes/account/password-reset.svelte index 9b09036..6b8d021 100644 --- a/frontend/src/routes/account/password-reset.svelte +++ b/frontend/src/routes/account/password-reset.svelte @@ -1,4 +1,4 @@ - - - -
+
-
-
-

+
+

ClassQuiz

@@ -69,73 +66,70 @@

--> -

+

{$t('password_reset_page.reset_password')}

-
-
-
+
+
+
-
-
+
+
-
+
{$t('register_page.already_have_account?')}{$t('register_page.already_have_account?')}
- {$t('login_page.already_have_account')} + {$t('login_page.already_have_account')} {$t('words.register')}{$t('words.register')}
-
\ No newline at end of file +
diff --git a/frontend/src/routes/account/reset-password.svelte b/frontend/src/routes/account/reset-password.svelte index 9159d24..afe0d76 100644 --- a/frontend/src/routes/account/reset-password.svelte +++ b/frontend/src/routes/account/reset-password.svelte @@ -1,4 +1,4 @@ - - -
+
-
-
-

+
+

ClassQuiz

@@ -57,55 +59,52 @@

--> -

+

{$t('password_reset_page.reset_password')}

-
-
-
+
+
+
-
+
{$t('register_page.already_have_account?')}{$t('register_page.already_have_account?')}
- {$t('login_page.already_have_account')} + {$t('login_page.already_have_account')} {$t('words.register')}{$t('words.register')}
diff --git a/frontend/src/routes/account/settings.svelte b/frontend/src/routes/account/settings.svelte index 8889b61..bf61546 100644 --- a/frontend/src/routes/account/settings.svelte +++ b/frontend/src/routes/account/settings.svelte @@ -1,4 +1,4 @@ - - {#await getUser()} - + {:then user} -
-
-
+
+
+
Profile image of {user.username}
-

{user.username}

-

{$t("words.email")}: {user.email}

+

{user.username}

+

+ {$t('words.email')}: {user.email} +

- - - - + + + + diff --git a/frontend/src/routes/admin.svelte b/frontend/src/routes/admin.svelte index bafa110..ef8fc6a 100644 --- a/frontend/src/routes/admin.svelte +++ b/frontend/src/routes/admin.svelte @@ -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(); diff --git a/frontend/src/routes/create.svelte b/frontend/src/routes/create.svelte index b9adb74..2645e8e 100644 --- a/frontend/src/routes/create.svelte +++ b/frontend/src/routes/create.svelte @@ -26,6 +26,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(); diff --git a/frontend/src/routes/debug.svelte b/frontend/src/routes/debug.svelte index 41d727f..1b7e848 100644 --- a/frontend/src/routes/debug.svelte +++ b/frontend/src/routes/debug.svelte @@ -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; diff --git a/frontend/src/routes/docs/__layout.svelte b/frontend/src/routes/docs/__layout.svelte index 4575273..6123188 100644 --- a/frontend/src/routes/docs/__layout.svelte +++ b/frontend/src/routes/docs/__layout.svelte @@ -1,5 +1,8 @@
diff --git a/frontend/src/routes/edit.svelte b/frontend/src/routes/edit.svelte index bc8f53e..9e0b329 100644 --- a/frontend/src/routes/edit.svelte +++ b/frontend/src/routes/edit.svelte @@ -23,6 +23,9 @@ + + + - -
+
-
-

+
+

ClassQuiz

@@ -66,70 +70,70 @@

--> -

+

{$t('password_reset_page.reset_password')}

-
-
-
+
+
+
-
-
+
+
-
+
{$t('register_page.already_have_account?')}{$t('register_page.already_have_account?')}
- {$t('login_page.already_have_account')} + {$t('login_page.already_have_account')} {$t('words.register')}{$t('words.register')}
diff --git a/frontend/src/routes/account/settings.svelte b/frontend/src/routes/account/settings.svelte index 484694c..cd14c89 100644 --- a/frontend/src/routes/account/settings.svelte +++ b/frontend/src/routes/account/settings.svelte @@ -1,4 +1,4 @@ - - {#await getUser()} - + {:then user} -
-
-
+
+
+
Profile image of {user.username}
-

{user.username}

-

+

{user.username}

+

{$t('words.email')}: {user.email}

- + Old Password: New Password: New Password again: diff --git a/frontend/src/routes/admin.svelte b/frontend/src/routes/admin.svelte index ef8fc6a..06379fe 100644 --- a/frontend/src/routes/admin.svelte +++ b/frontend/src/routes/admin.svelte @@ -41,7 +41,10 @@ export let auto_connect: boolean; export let game_token: string; let success = false; - let players: Array = []; + interface Player { + username: string + } + let players: Array = []; let errorMessage = ''; let game_started = false; let quiz_data: QuizData; diff --git a/frontend/src/routes/edit.svelte b/frontend/src/routes/edit.svelte index ce2a224..4e8f431 100644 --- a/frontend/src/routes/edit.svelte +++ b/frontend/src/routes/edit.svelte @@ -102,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" /> -{:then lol} +{:then _} {#if data !== undefined} diff --git a/frontend/src/routes/overview.svelte b/frontend/src/routes/overview.svelte index 8318ae7..6e7b686 100644 --- a/frontend/src/routes/overview.svelte +++ b/frontend/src/routes/overview.svelte @@ -1,4 +1,4 @@ - - -