Run pnpm format

This commit is contained in:
THIVEND
2022-04-09 16:31:41 +02:00
parent 47f8796aa3
commit 7da2fb7952
7 changed files with 448 additions and 441 deletions
+114 -114
View File
@@ -1,116 +1,116 @@
{ {
"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"
}, },
"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"
} }
} }
+107 -107
View File
@@ -1,109 +1,109 @@
{ {
"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"
}, },
"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"
} }
} }
+107 -107
View File
@@ -1,109 +1,109 @@
{ {
"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": "" "repeat_password": ""
}, },
"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": "" "reset_password": ""
} }
} }
@@ -1,4 +1,4 @@
<script lang='ts' context='module'> <script lang="ts" context="module">
export async function load({ url }) { export async function load({ url }) {
const token = url.searchParams.get('token'); const token = url.searchParams.get('token');
@@ -9,8 +9,8 @@
}; };
} }
</script> </script>
<script lang='ts'>
<script lang="ts">
import { getLocalization } from '../../lib/i18n'; import { getLocalization } from '../../lib/i18n';
const { t } = getLocalization(); const { t } = getLocalization();
@@ -48,19 +48,16 @@
alert(data.detail); alert(data.detail);
} }
isSubmitting = false; isSubmitting = false;
}; };
</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"
> >
<div class='px-6 py-4'> <div class="px-6 py-4">
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'> <h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">
ClassQuiz ClassQuiz
</h2> </h2>
@@ -69,73 +66,70 @@
</h3> </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('password_reset_page.reset_password')} {$t('password_reset_page.reset_password')}
</p> </p>
<form on:submit|preventDefault={submit}> <form on:submit|preventDefault={submit}>
<div class='w-full mt-4'> <div class="w-full mt-4">
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'> <div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class='relative bg-inherit w-full'> <div class="relative bg-inherit w-full">
<input <input
id='password1' id="password1"
bind:value={passwordData.password1} bind:value={passwordData.password1}
name='password1' name="password1"
type='password' type="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')} placeholder={$t('words.password')}
/> />
<label <label
for='password1' for="password1"
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' 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.password')} {$t('words.password')}
</label> </label>
</div> </div>
</div> </div>
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'> <div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class='relative bg-inherit w-full'> <div class="relative bg-inherit w-full">
<input <input
id='password2' id="password2"
name='password2' name="password2"
type='password' type="password"
bind:value={passwordData.password2} bind:value={passwordData.password2}
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.repeat_password')} placeholder={$t('words.repeat_password')}
/> />
<label <label
for='password2' for="password2"
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' 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.repeat_password')} {$t('words.repeat_password')}
</label> </label>
</div> </div>
</div> </div>
<div class='flex items-center justify-between mt-4'> <div class="flex items-center justify-between mt-4">
<a <a
href='/account/login' href="/account/login"
class='text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500' class="text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500"
>{$t('register_page.already_have_account?')}</a >{$t('register_page.already_have_account?')}</a
> >
<button <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={!passwordsValid} disabled={!passwordsValid}
type='submit' type="submit"
> >
{#if isSubmitting} {#if isSubmitting}
<svg <svg class="h-4 w-4 animate-spin mx-auto" viewBox="3 3 18 18">
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"
/> />
<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>
{:else} {:else}
@@ -148,18 +142,18 @@
</div> </div>
<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' <span class="text-sm text-gray-600 dark:text-gray-200"
>{$t('login_page.already_have_account')} >{$t('login_page.already_have_account')}
</span> </span>
<a <a
href='/account/register' href="/account/register"
class='mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline' class="mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline"
>{$t('words.register')}</a >{$t('words.register')}</a
> >
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -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 {
@@ -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();
@@ -41,14 +41,13 @@
let email = ''; let email = '';
</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"
> >
<div class='px-6 py-4'> <div class="px-6 py-4">
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'> <h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">
ClassQuiz ClassQuiz
</h2> </h2>
@@ -57,55 +56,52 @@
</h3> </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('password_reset_page.reset_password')} {$t('password_reset_page.reset_password')}
</p> </p>
<form on:submit|preventDefault={submit}> <form on:submit|preventDefault={submit}>
<div class='w-full mt-4'> <div class="w-full mt-4">
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'> <div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class='relative bg-inherit w-full'> <div class="relative bg-inherit w-full">
<input <input
id='email' id="email"
bind:value={email} bind:value={email}
name='email' name="email"
type='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' 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')} placeholder={$t('words.email')}
/> />
<label <label
for='email' 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' 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')} {$t('words.email')}
</label> </label>
</div> </div>
</div> </div>
<div class='flex items-center justify-between mt-4'> <div class="flex items-center justify-between mt-4">
<a <a
href='/account/login' href="/account/login"
class='text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500' class="text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500"
>{$t('register_page.already_have_account?')}</a >{$t('register_page.already_have_account?')}</a
> >
<button <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={email === ''} disabled={email === ''}
type='submit' type="submit"
> >
{#if isSubmitting} {#if isSubmitting}
<svg <svg class="h-4 w-4 animate-spin mx-auto" viewBox="3 3 18 18">
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"
/> />
<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>
{:else} {:else}
@@ -118,16 +114,16 @@
</div> </div>
<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' <span class="text-sm text-gray-600 dark:text-gray-200"
>{$t('login_page.already_have_account')} >{$t('login_page.already_have_account')}
</span> </span>
<a <a
href='/account/register' href="/account/register"
class='mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline' class="mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline"
>{$t('words.register')}</a >{$t('words.register')}</a
> >
</div> </div>
</div> </div>
+41 -26
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 { getLocalization } from '$lib/i18n'; import { getLocalization } from '$lib/i18n';
const { t } = getLocalization(); const { t } = getLocalization();
@@ -38,7 +38,9 @@
console.log('Check password'); console.log('Check password');
passwordChangeDataValid = passwordChangeDataValid =
data.newPassword === data.newPasswordConfirm && data.newPassword === data.newPasswordConfirm &&
data.newPassword.length >= 8 && data.oldPassword !== data.newPassword && data.oldPassword !== ''; data.newPassword.length >= 8 &&
data.oldPassword !== data.newPassword &&
data.oldPassword !== '';
}; };
$: checkPasswords(changePasswordData); $: checkPasswords(changePasswordData);
const changePassword = async () => { const changePassword = async () => {
@@ -63,7 +65,6 @@
} }
}; };
const getUser = async (): Promise<UserAccount> => { const getUser = async (): Promise<UserAccount> => {
const response = await fetch('/api/v1/users/me', { const response = await fetch('/api/v1/users/me', {
method: 'GET', method: 'GET',
@@ -80,41 +81,55 @@
</script> </script>
{#await getUser()} {#await getUser()}
<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 user} {:then user}
<div class='w-full'> <div class="w-full">
<div class='sm:flex space-x-7 md:items-start items-center'> <div class="sm:flex space-x-7 md:items-start items-center">
<div class='mb-4'> <div class="mb-4">
<img <img
class='rounded-md md:w-80' class="rounded-md md:w-80"
src='https://cdn.statically.io/avatar/shape=rounded/{user.username}' src="https://cdn.statically.io/avatar/shape=rounded/{user.username}"
alt='Profile image of {user.username}' alt="Profile image of {user.username}"
/> />
</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'>{$t("words.email")}: {user.email}</p> <p class="text-slate-100 text-lg mb-6 md:max-w-lg">
{$t('words.email')}: {user.email}
</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>Old Password:<input class='m-2 text-black' <label
bind:value={changePasswordData.oldPassword} /></label> >Old Password:<input
<label>New Password:<input class='m-2 text-black' class="m-2 text-black"
bind:value={changePasswordData.newPassword} /></label> bind:value={changePasswordData.oldPassword}
<label>New Password again:<input class='m-2 text-black' /></label
bind:value={changePasswordData.newPasswordConfirm} /></label> >
<label
>New Password:<input
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
>
<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"
disabled={!passwordChangeDataValid} disabled={!passwordChangeDataValid}
type='submit' type="submit"
> >
Change Password! Change Password!
</button> </button>
+4 -2
View File
@@ -93,9 +93,11 @@
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 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"> <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"
>
{$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">