✨ Added password-change and forgotten password
This commit is contained in:
Mawoka
@@ -1,3 +1,4 @@
|
|||||||
|
import os
|
||||||
import smtplib
|
import smtplib
|
||||||
import ssl
|
import ssl
|
||||||
from email.mime.multipart import MIMEMultipart
|
from email.mime.multipart import MIMEMultipart
|
||||||
@@ -5,7 +6,7 @@ from email.mime.text import MIMEText
|
|||||||
|
|
||||||
from jinja2 import Environment, PackageLoader, select_autoescape
|
from jinja2 import Environment, PackageLoader, select_autoescape
|
||||||
|
|
||||||
from classquiz.config import settings
|
from classquiz.config import settings, redis
|
||||||
from classquiz.db.models import User
|
from classquiz.db.models import User
|
||||||
|
|
||||||
settings = settings()
|
settings = settings()
|
||||||
@@ -41,3 +42,18 @@ async def send_register_email(email: str):
|
|||||||
token=user.verify_key
|
token=user.verify_key
|
||||||
)
|
)
|
||||||
_sendMail(template=template, to=email, subject='Verify your email')
|
_sendMail(template=template, to=email, subject='Verify your email')
|
||||||
|
|
||||||
|
|
||||||
|
async def send_forgotten_password_email(email: str):
|
||||||
|
user = await User.objects.get_or_none(email=email)
|
||||||
|
if user is None:
|
||||||
|
raise ValueError('User not found')
|
||||||
|
template = jinja.get_template('forgotten_password.jinja2')
|
||||||
|
token = os.urandom(32).hex()
|
||||||
|
template = await template.render_async(
|
||||||
|
base_url=settings.root_address,
|
||||||
|
token=token
|
||||||
|
)
|
||||||
|
await redis.set(f"reset_passwd:{token}", str(user.id), ex=3600)
|
||||||
|
_sendMail(template=template, to=email, subject='Reset your password')
|
||||||
|
pass
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
<div style='box-sizing: border-box;display: block;max-width: 600px;margin: 0 auto;padding: 10px'><span
|
||||||
|
style='color: transparent;height: 0;max-height: 0;max-width: 0;opacity: 0;overflow: hidden;mso-hide: all;visibility: hidden;width: 0'>Let's confirm your email address.</span>
|
||||||
|
<div style='box-sizing: border-box;width: 100%;margin-bottom: 30px;margin-top: 15px'>
|
||||||
|
<table
|
||||||
|
style='box-sizing: border-box;width: 100%;border-spacing: 0;mso-table-rspace: 0pt;mso-table-lspace: 0pt;border-collapse: separate !important'
|
||||||
|
width='100%'>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div style='box-sizing: border-box;width: 100%;margin-bottom: 30px;background: #ffffff;border: 1px solid #f0f0f0'>
|
||||||
|
<table
|
||||||
|
style='box-sizing: border-box;width: 100%;border-spacing: 0;mso-table-rspace: 0pt;mso-table-lspace: 0pt;border-collapse: separate !important'
|
||||||
|
width='100%'>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="box-sizing: border-box;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size: 16px;vertical-align: top;padding: 30px"
|
||||||
|
valign='top'>
|
||||||
|
<table
|
||||||
|
style='box-sizing: border-box;width: 100%;border-spacing: 0;mso-table-rspace: 0pt;mso-table-lspace: 0pt;border-collapse: separate !important'
|
||||||
|
width='100%'>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="box-sizing: border-box;padding: 0;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size: 16px;vertical-align: top"
|
||||||
|
valign='top'><h2
|
||||||
|
style="margin: 0;margin-bottom: 30px;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-weight: 300;line-height: 1.5;font-size: 24px;color: #294661 !important">
|
||||||
|
You're on your way!<br> Let's reset your password.</h2>
|
||||||
|
<p style="margin: 0;margin-bottom: 30px;color: #294661;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size: 16px;font-weight: 300">
|
||||||
|
By clicking on the following link, you are going to reset your password.</p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="box-sizing: border-box;padding: 0;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size: 16px;vertical-align: top"
|
||||||
|
valign='top'>
|
||||||
|
<table
|
||||||
|
style='box-sizing: border-box;border-spacing: 0;mso-table-rspace: 0pt;mso-table-lspace: 0pt;width: 100%;border-collapse: separate !important'
|
||||||
|
width='100%' cellspacing='0' cellpadding='0'>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="box-sizing: border-box;padding: 0;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size: 16px;vertical-align: top;padding-bottom: 15px"
|
||||||
|
valign='top' align='center'>
|
||||||
|
<table
|
||||||
|
style='box-sizing: border-box;border-spacing: 0;mso-table-rspace: 0pt;mso-table-lspace: 0pt;width: auto;border-collapse: separate !important'
|
||||||
|
cellspacing='0' cellpadding='0'>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="box-sizing: border-box;padding: 0;font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size: 16px;vertical-align: top;background-color: #348eda;border-radius: 2px;text-align: center;background-color: #348eda"
|
||||||
|
valign='top' align='center'><a
|
||||||
|
href='{{ base_url }}/account/password-reset?token={{ token }}'
|
||||||
|
style='box-sizing: border-box;font-weight: 400;text-decoration: none;display: inline-block;margin: 0;color: #ffffff;background: linear-gradient(90deg, #009444, #39b54a, #8dc63f);border: solid 1px black;border-radius: 2px;font-size: 14px;padding: 12px 45px'
|
||||||
|
rel='external nofollow noopener noreferrer' target='_blank'
|
||||||
|
tabindex='-1'>Confirm Password Reset</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{% include 'footer.jinja2' %}
|
||||||
|
|
||||||
|
</div>
|
||||||
@@ -10,7 +10,7 @@ from classquiz.auth import *
|
|||||||
from classquiz.config import redis
|
from classquiz.config import redis
|
||||||
from classquiz.cache import clear_cache_for_account
|
from classquiz.cache import clear_cache_for_account
|
||||||
from classquiz.db.models import *
|
from classquiz.db.models import *
|
||||||
from classquiz.emails import send_register_email
|
from classquiz.emails import send_register_email, send_forgotten_password_email
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@@ -18,6 +18,11 @@ route_user = User.get_pydantic(
|
|||||||
exclude={"id": ..., "verified": ..., "verify_key": ..., "created_at": ..., "usersessions": ...})
|
exclude={"id": ..., "verified": ..., "verify_key": ..., "created_at": ..., "usersessions": ...})
|
||||||
|
|
||||||
|
|
||||||
|
async def _sign_out_everywhere(user: User) -> None:
|
||||||
|
await UserSession.objects.filter(user=user).delete()
|
||||||
|
await clear_cache_for_account(user)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/create", response_model=User,
|
@router.post("/create", response_model=User,
|
||||||
response_model_include={"id": ..., "verified": ..., "email": ...})
|
response_model_include={"id": ..., "verified": ..., "email": ...})
|
||||||
async def create_user(user: route_user, background_task: BackgroundTasks) -> User | JSONResponse:
|
async def create_user(user: route_user, background_task: BackgroundTasks) -> User | JSONResponse:
|
||||||
@@ -135,8 +140,7 @@ async def change_password(password_data: UpdatePassword, response: Response, use
|
|||||||
|
|
||||||
@router.delete("/signout-everywhere")
|
@router.delete("/signout-everywhere")
|
||||||
async def signout_everywhere(response: Response, user: User = Depends(get_current_user)):
|
async def signout_everywhere(response: Response, user: User = Depends(get_current_user)):
|
||||||
await UserSession.objects.filter(user=user).delete()
|
await _sign_out_everywhere(user)
|
||||||
await clear_cache_for_account(user)
|
|
||||||
response.delete_cookie("access_token")
|
response.delete_cookie("access_token")
|
||||||
response.delete_cookie("expiry")
|
response.delete_cookie("expiry")
|
||||||
response.delete_cookie("rememberme")
|
response.delete_cookie("rememberme")
|
||||||
@@ -147,3 +151,39 @@ async def signout_everywhere(response: Response, user: User = Depends(get_curren
|
|||||||
@router.get("/me", response_model_exclude={"password", "verify_key", "usersessions"})
|
@router.get("/me", response_model_exclude={"password", "verify_key", "usersessions"})
|
||||||
async def get_me(user: User = Depends(get_current_user)):
|
async def get_me(user: User = Depends(get_current_user)):
|
||||||
return user.dict(exclude={"password", "verify_key", "usersessions"})
|
return user.dict(exclude={"password", "verify_key", "usersessions"})
|
||||||
|
|
||||||
|
|
||||||
|
class ForgotPassword(BaseModel):
|
||||||
|
email: str
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/forgot-password")
|
||||||
|
async def forgotten_password(forgot_password: ForgotPassword):
|
||||||
|
user = await User.objects.filter(email=forgot_password.email, verified=True).get_or_none()
|
||||||
|
if user is None:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
await send_forgotten_password_email(user.email)
|
||||||
|
return {"message": "Password reset email sent"}
|
||||||
|
|
||||||
|
|
||||||
|
class ResetPassword(BaseModel):
|
||||||
|
password: str
|
||||||
|
token: str
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/reset-password")
|
||||||
|
async def reset_password_with_token(reset_password: ResetPassword, response: Response):
|
||||||
|
redis_res = await redis.get(f"reset_passwd:{reset_password.token}")
|
||||||
|
if redis_res is None:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid token")
|
||||||
|
user = await User.objects.filter(id=uuid.UUID(redis_res)).get_or_none()
|
||||||
|
if user is None:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid token")
|
||||||
|
user.password = get_password_hash(reset_password.password)
|
||||||
|
await user.update()
|
||||||
|
await _sign_out_everywhere(user)
|
||||||
|
response.delete_cookie("access_token")
|
||||||
|
response.delete_cookie("expiry")
|
||||||
|
response.delete_cookie("rememberme")
|
||||||
|
response.delete_cookie("rememberme_token")
|
||||||
|
return {"message": "Password updated successfully"}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ module.exports = {
|
|||||||
trans: false,
|
trans: false,
|
||||||
|
|
||||||
// Create and update files `en.json`, `fr.json`, `es.json`
|
// Create and update files `en.json`, `fr.json`, `es.json`
|
||||||
lngs: ['en', 'de'],
|
lngs: ['en', 'de', 'fr'],
|
||||||
|
|
||||||
ns: [
|
ns: [
|
||||||
// The namespace I use
|
// The namespace I use
|
||||||
|
|||||||
@@ -81,7 +81,9 @@
|
|||||||
"password": "Passwort",
|
"password": "Passwort",
|
||||||
"email": "Email",
|
"email": "Email",
|
||||||
"description": "Beschreibung",
|
"description": "Beschreibung",
|
||||||
"image": "Bild"
|
"image": "Bild",
|
||||||
|
"settings": "Einstellungen",
|
||||||
|
"repeat_password": "Passwort wiederholen"
|
||||||
},
|
},
|
||||||
"editor": {
|
"editor": {
|
||||||
"time_in_seconds": "Zeit in Sekunden",
|
"time_in_seconds": "Zeit in Sekunden",
|
||||||
@@ -107,5 +109,8 @@
|
|||||||
"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": {
|
||||||
|
"reset_password": "Passwort zurücksetzen"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,9 @@
|
|||||||
"close": "Close",
|
"close": "Close",
|
||||||
"save": "Save",
|
"save": "Save",
|
||||||
"description": "Description",
|
"description": "Description",
|
||||||
"image": "Image"
|
"image": "Image",
|
||||||
|
"settings": "Settings",
|
||||||
|
"repeat_password": "Repeat password"
|
||||||
},
|
},
|
||||||
"editor": {
|
"editor": {
|
||||||
"time_in_seconds": "Time in seconds",
|
"time_in_seconds": "Time in seconds",
|
||||||
@@ -100,5 +102,8 @@
|
|||||||
"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": {
|
||||||
|
"reset_password": "Reset password"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,9 @@
|
|||||||
"save": "Enregistrer",
|
"save": "Enregistrer",
|
||||||
"description": "Description",
|
"description": "Description",
|
||||||
"image": "Image",
|
"image": "Image",
|
||||||
"title": "titre"
|
"title": "titre",
|
||||||
|
"settings": "Paramètres",
|
||||||
|
"repeat_password": ""
|
||||||
},
|
},
|
||||||
"index_page": {
|
"index_page": {
|
||||||
"slogan": "La plateforme de quiz open-source !",
|
"slogan": "La plateforme de quiz open-source !",
|
||||||
@@ -100,5 +102,8 @@
|
|||||||
"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": {
|
||||||
|
"reset_password": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,165 @@
|
|||||||
|
<script lang='ts' context='module'>
|
||||||
|
export async function load({ url }) {
|
||||||
|
const token = url.searchParams.get('token');
|
||||||
|
|
||||||
|
return {
|
||||||
|
props: {
|
||||||
|
token
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<script lang='ts'>
|
||||||
|
|
||||||
|
import { getLocalization } from '../../lib/i18n';
|
||||||
|
|
||||||
|
const { t } = getLocalization();
|
||||||
|
export let token: string;
|
||||||
|
let isSubmitting = false;
|
||||||
|
let passwordData = {
|
||||||
|
password1: '',
|
||||||
|
password2: ''
|
||||||
|
};
|
||||||
|
let passwordsValid = false;
|
||||||
|
const checkIfPasswordsValid = (pwdata) => {
|
||||||
|
passwordsValid = pwdata.password1 === pwdata.password2 && pwdata.password1.length >= 8;
|
||||||
|
};
|
||||||
|
$: checkIfPasswordsValid(passwordData);
|
||||||
|
|
||||||
|
const submit = async () => {
|
||||||
|
if (!passwordsValid) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
isSubmitting = true;
|
||||||
|
const response = await fetch('/api/v1/users/reset-password', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
password: passwordData.password1,
|
||||||
|
token
|
||||||
|
})
|
||||||
|
});
|
||||||
|
const data = await response.json();
|
||||||
|
if (response.status === 200) {
|
||||||
|
window.location.replace('/account/login');
|
||||||
|
} else {
|
||||||
|
alert(data.detail);
|
||||||
|
}
|
||||||
|
isSubmitting = false;
|
||||||
|
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
<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'
|
||||||
|
>
|
||||||
|
<div class='px-6 py-4'>
|
||||||
|
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'>
|
||||||
|
ClassQuiz
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
<h3 class='mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200'>
|
||||||
|
</h3>
|
||||||
|
-->
|
||||||
|
|
||||||
|
<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'>
|
||||||
|
<input
|
||||||
|
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'
|
||||||
|
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'
|
||||||
|
>
|
||||||
|
{$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'>
|
||||||
|
<input
|
||||||
|
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'
|
||||||
|
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'
|
||||||
|
>
|
||||||
|
{$t('words.repeat_password')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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
|
||||||
|
>
|
||||||
|
|
||||||
|
<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'
|
||||||
|
disabled={!passwordsValid}
|
||||||
|
type='submit'
|
||||||
|
>
|
||||||
|
{#if isSubmitting}
|
||||||
|
<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'
|
||||||
|
/>
|
||||||
|
<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'
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else}
|
||||||
|
{$t('words.submit')}
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
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>
|
||||||
|
|
||||||
|
<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>
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
<script context='module' lang='ts'>
|
||||||
|
export async function load({ session }) {
|
||||||
|
if (session.authenticated) {
|
||||||
|
return {
|
||||||
|
status: 302,
|
||||||
|
redirect: '/overview'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script lang='ts'>
|
||||||
|
import { getLocalization } from '../../lib/i18n';
|
||||||
|
|
||||||
|
const { t } = getLocalization();
|
||||||
|
|
||||||
|
let isSubmitting = false;
|
||||||
|
// TODO: Add translation
|
||||||
|
|
||||||
|
const submit = async () => {
|
||||||
|
isSubmitting = true;
|
||||||
|
const res = await fetch('/api/v1/users/forgot-password', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
email: email
|
||||||
|
})
|
||||||
|
});
|
||||||
|
if (res.status === 200) {
|
||||||
|
alert('Email was sent! Please check your inbox.');
|
||||||
|
return;
|
||||||
|
} else if (res.status === 404) {
|
||||||
|
alert('user not found!');
|
||||||
|
}
|
||||||
|
isSubmitting = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
let email = '';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<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'
|
||||||
|
>
|
||||||
|
<div class='px-6 py-4'>
|
||||||
|
<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'>
|
||||||
|
ClassQuiz
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
<h3 class='mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200'>
|
||||||
|
</h3>
|
||||||
|
-->
|
||||||
|
|
||||||
|
<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'>
|
||||||
|
<input
|
||||||
|
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'
|
||||||
|
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'
|
||||||
|
>
|
||||||
|
{$t('words.email')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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
|
||||||
|
>
|
||||||
|
|
||||||
|
<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'
|
||||||
|
disabled={email === ''}
|
||||||
|
type='submit'
|
||||||
|
>
|
||||||
|
{#if isSubmitting}
|
||||||
|
<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'
|
||||||
|
/>
|
||||||
|
<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'
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:else}
|
||||||
|
{$t('words.submit')}
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
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>
|
||||||
|
|
||||||
|
<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>
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
<script context='module' lang='ts'>
|
||||||
|
export async function load({ session }) {
|
||||||
|
if (!session.authenticated) {
|
||||||
|
return {
|
||||||
|
status: 302,
|
||||||
|
redirect: '/account/login'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
props: {
|
||||||
|
email: session.email
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script lang='ts'>
|
||||||
|
import { getLocalization } from '$lib/i18n';
|
||||||
|
|
||||||
|
const { t } = getLocalization();
|
||||||
|
|
||||||
|
interface UserAccount {
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
username: string;
|
||||||
|
verified: boolean;
|
||||||
|
created_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
let changePasswordData = {
|
||||||
|
oldPassword: '',
|
||||||
|
newPassword: '',
|
||||||
|
newPasswordConfirm: ''
|
||||||
|
};
|
||||||
|
|
||||||
|
let passwordChangeDataValid = false;
|
||||||
|
const checkPasswords = (data) => {
|
||||||
|
console.log('Check password');
|
||||||
|
passwordChangeDataValid =
|
||||||
|
data.newPassword === data.newPasswordConfirm &&
|
||||||
|
data.newPassword.length >= 8 && data.oldPassword !== data.newPassword && data.oldPassword !== '';
|
||||||
|
};
|
||||||
|
$: checkPasswords(changePasswordData);
|
||||||
|
const changePassword = async () => {
|
||||||
|
if (!passwordChangeDataValid) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const res = await fetch('/api/v1/users/password/update', {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
old_password: changePasswordData.oldPassword,
|
||||||
|
new_password: changePasswordData.newPassword
|
||||||
|
})
|
||||||
|
});
|
||||||
|
if (res.status === 200) {
|
||||||
|
alert('Password changed');
|
||||||
|
window.location.replace('/account/login');
|
||||||
|
} else {
|
||||||
|
alert('Password change failed');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const getUser = async (): Promise<UserAccount> => {
|
||||||
|
const response = await fetch('/api/v1/users/me', {
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (response.status === 200) {
|
||||||
|
return await response.json();
|
||||||
|
} else {
|
||||||
|
window.location.replace('/account/login');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#await getUser()}
|
||||||
|
<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'
|
||||||
|
/>
|
||||||
|
<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'
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{:then user}
|
||||||
|
<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}'
|
||||||
|
/>
|
||||||
|
</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>
|
||||||
|
<!-- 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>
|
||||||
|
<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'
|
||||||
|
disabled={!passwordChangeDataValid}
|
||||||
|
type='submit'
|
||||||
|
>
|
||||||
|
Change Password!
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/await}
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
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-3 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"
|
||||||
@@ -93,6 +93,10 @@
|
|||||||
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">
|
||||||
|
{$t('words.settings')}
|
||||||
|
|
||||||
|
</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">
|
||||||
|
|||||||
Reference in New Issue
Block a user