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
@@ -1,4 +1,4 @@
<script lang='ts' context='module'>
<script lang="ts" context="module">
export async function load({ url }) {
const token = url.searchParams.get('token');
@@ -9,8 +9,8 @@
};
}
</script>
<script lang='ts'>
<script lang="ts">
import { getLocalization } from '../../lib/i18n';
const { t } = getLocalization();
@@ -48,19 +48,16 @@
alert(data.detail);
}
isSubmitting = false;
};
</script>
<div class='flex items-center justify-center h-full px-4'>
<div class="flex items-center justify-center h-full px-4">
<div>
<div
class='w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800'
class="w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
>
<div class='px-6 py-4'>
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'>
<div class="px-6 py-4">
<h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">
ClassQuiz
</h2>
@@ -69,73 +66,70 @@
</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')}
</p>
<form on:submit|preventDefault={submit}>
<div class='w-full mt-4'>
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
<div class='relative bg-inherit w-full'>
<div class="w-full mt-4">
<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class="relative bg-inherit w-full">
<input
id='password1'
id="password1"
bind:value={passwordData.password1}
name='password1'
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'
name="password1"
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"
placeholder={$t('words.password')}
/>
<label
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'
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"
>
{$t('words.password')}
</label>
</div>
</div>
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
<div class='relative bg-inherit w-full'>
<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class="relative bg-inherit w-full">
<input
id='password2'
name='password2'
type='password'
id="password2"
name="password2"
type="password"
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')}
/>
<label
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'
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"
>
{$t('words.repeat_password')}
</label>
</div>
</div>
<div class='flex items-center justify-between mt-4'>
<div class="flex items-center justify-between mt-4">
<a
href='/account/login'
class='text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500'
>{$t('register_page.already_have_account?')}</a
href="/account/login"
class="text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500"
>{$t('register_page.already_have_account?')}</a
>
<button
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
disabled={!passwordsValid}
type='submit'
type="submit"
>
{#if isSubmitting}
<svg
class='h-4 w-4 animate-spin mx-auto'
viewBox='3 3 18 18'
>
<svg class="h-4 w-4 animate-spin mx-auto" viewBox="3 3 18 18">
<path
class='fill-black'
d='M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z'
class="fill-black"
d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
/>
<path
class='fill-blue-100'
d='M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z'
class="fill-blue-100"
d="M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z"
/>
</svg>
{:else}
@@ -148,18 +142,18 @@
</div>
<div
class='flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700'
class="flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700"
>
<span class='text-sm text-gray-600 dark:text-gray-200'
>{$t('login_page.already_have_account')}
<span class="text-sm text-gray-600 dark:text-gray-200"
>{$t('login_page.already_have_account')}
</span>
<a
href='/account/register'
class='mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline'
>{$t('words.register')}</a
href="/account/register"
class="mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline"
>{$t('words.register')}</a
>
</div>
</div>
</div>
</div>
</div>
@@ -1,4 +1,4 @@
<script context='module' lang='ts'>
<script context="module" lang="ts">
export async function load({ session }) {
if (session.authenticated) {
return {
@@ -10,7 +10,7 @@
}
</script>
<script lang='ts'>
<script lang="ts">
import { getLocalization } from '../../lib/i18n';
const { t } = getLocalization();
@@ -41,14 +41,13 @@
let email = '';
</script>
<div class='flex items-center justify-center h-full px-4'>
<div class="flex items-center justify-center h-full px-4">
<div>
<div
class='w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800'
class="w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
>
<div class='px-6 py-4'>
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'>
<div class="px-6 py-4">
<h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">
ClassQuiz
</h2>
@@ -57,55 +56,52 @@
</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')}
</p>
<form on:submit|preventDefault={submit}>
<div class='w-full mt-4'>
<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
<div class='relative bg-inherit w-full'>
<div class="w-full mt-4">
<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
<div class="relative bg-inherit w-full">
<input
id='email'
id="email"
bind:value={email}
name='email'
type='email'
class='w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600'
name="email"
type="email"
class="w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600"
placeholder={$t('words.email')}
/>
<label
for='email'
class='absolute cursor-text left-0 -top-3 text-sm text-gray-700 dark:text-white bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all'
for="email"
class="absolute cursor-text left-0 -top-3 text-sm text-gray-700 dark:text-white bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all"
>
{$t('words.email')}
</label>
</div>
</div>
<div class='flex items-center justify-between mt-4'>
<div class="flex items-center justify-between mt-4">
<a
href='/account/login'
class='text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500'
>{$t('register_page.already_have_account?')}</a
href="/account/login"
class="text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500"
>{$t('register_page.already_have_account?')}</a
>
<button
class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
disabled={email === ''}
type='submit'
type="submit"
>
{#if isSubmitting}
<svg
class='h-4 w-4 animate-spin mx-auto'
viewBox='3 3 18 18'
>
<svg class="h-4 w-4 animate-spin mx-auto" viewBox="3 3 18 18">
<path
class='fill-black'
d='M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z'
class="fill-black"
d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
/>
<path
class='fill-blue-100'
d='M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z'
class="fill-blue-100"
d="M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z"
/>
</svg>
{:else}
@@ -118,16 +114,16 @@
</div>
<div
class='flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700'
class="flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700"
>
<span class='text-sm text-gray-600 dark:text-gray-200'
>{$t('login_page.already_have_account')}
<span class="text-sm text-gray-600 dark:text-gray-200"
>{$t('login_page.already_have_account')}
</span>
<a
href='/account/register'
class='mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline'
>{$t('words.register')}</a
href="/account/register"
class="mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline"
>{$t('words.register')}</a
>
</div>
</div>
+41 -26
View File
@@ -1,4 +1,4 @@
<script context='module' lang='ts'>
<script context="module" lang="ts">
export async function load({ session }) {
if (!session.authenticated) {
return {
@@ -14,7 +14,7 @@
}
</script>
<script lang='ts'>
<script lang="ts">
import { getLocalization } from '$lib/i18n';
const { t } = getLocalization();
@@ -38,7 +38,9 @@
console.log('Check password');
passwordChangeDataValid =
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);
const changePassword = async () => {
@@ -63,7 +65,6 @@
}
};
const getUser = async (): Promise<UserAccount> => {
const response = await fetch('/api/v1/users/me', {
method: 'GET',
@@ -80,41 +81,55 @@
</script>
{#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
class='fill-black'
d='M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z'
class="fill-black"
d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
/>
<path
class='fill-blue-100'
d='M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z'
class="fill-blue-100"
d="M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z"
/>
</svg>
{:then user}
<div class='w-full'>
<div class='sm:flex space-x-7 md:items-start items-center'>
<div class='mb-4'>
<div class="w-full">
<div class="sm:flex space-x-7 md:items-start items-center">
<div class="mb-4">
<img
class='rounded-md md:w-80'
src='https://cdn.statically.io/avatar/shape=rounded/{user.username}'
alt='Profile image of {user.username}'
class="rounded-md md:w-80"
src="https://cdn.statically.io/avatar/shape=rounded/{user.username}"
alt="Profile image of {user.username}"
/>
</div>
<div>
<h1 class='text-slate-100 text-4xl font-bold my-2'>{user.username}</h1>
<p class='text-slate-100 text-lg mb-6 md:max-w-lg'>{$t("words.email")}: {user.email}</p>
<h1 class="text-slate-100 text-4xl font-bold my-2">{user.username}</h1>
<p class="text-slate-100 text-lg mb-6 md:max-w-lg">
{$t('words.email')}: {user.email}
</p>
<!-- TODO: Add translation -->
<form class='flex flex-col md:flex-row' on:submit|preventDefault={changePassword}>
<label>Old Password:<input class='m-2 text-black'
bind:value={changePasswordData.oldPassword} /></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>
<form class="flex flex-col md:flex-row" on:submit|preventDefault={changePassword}>
<label
>Old Password:<input
class="m-2 text-black"
bind:value={changePasswordData.oldPassword}
/></label
>
<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
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}
type='submit'
type="submit"
>
Change Password!
</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"
>{$t('words.logout')}
</a>
<a href='/account/settings' class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50">
<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')}
</a>
</div>
<div class="overflow-x-auto sm:-mx-8 lg:-mx-8">