LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Mawoka
2022-07-26 22:51:19 +02:00
parent 29bda964b0 6918cc0d28
commit 1b8e4d5524
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/routes/account/password-reset.svelte
+1 -1
View File
@@ -52,7 +52,7 @@
});
const data = await response.json();
if (response.status === 200) {
window.location.replace('/account/login');
window.location.assign('/account/login');
} else {
alert(data.detail);
}
frontend/src/routes/account/register.svelte
+1 -1
View File
@@ -367,7 +367,7 @@
type="button"
on:click={() => {
responseData.open = false;
window.location.replace('/');
window.location.assign('/');
}}
class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
>{$t('words.close')}
frontend/src/routes/account/settings.svelte
+3 -3
View File
@@ -77,7 +77,7 @@
});
if (res.status === 200) {
alert('Password changed');
window.location.replace('/account/login');
window.location.assign('/account/login');
} else {
alert('Password change failed');
}
@@ -93,7 +93,7 @@
if (response.status === 200) {
return await response.json();
} else {
window.location.replace('/account/login');
window.location.assign('/account/login');
}
};
const formatDate = (date: string): string => {
@@ -110,7 +110,7 @@
}
return await res.json();
} else {
window.location.replace('/account/login?returnTo=/account/settings');
window.location.assign('/account/login?returnTo=/account/settings');
}
return await res.json();
};
frontend/src/routes/overview.svelte
+2 -2
View File
@@ -71,13 +71,13 @@
body: `Failed to start game, ${await res.text()}`
});
alertModal.subscribe((_) => {
window.location.replace('/account/login?returnTo=/overview');
window.location.assign('/account/login?returnTo=/overview');
});
}
const data = await res.json();
// eslint-disable-next-line no-undef
plausible('Started Game', { props: { quiz_id: id } });
window.location.replace(`/admin?token=${data.game_id}&pin=${data.game_pin}&connect=1`);
window.location.assign(`/admin?token=${data.game_id}&pin=${data.game_pin}&connect=1`);
};
const deleteQuiz = async (to_delete: string) => {
frontend/src/routes/view/[quiz_id].svelte
+1 -1
View File
@@ -84,7 +84,7 @@
const data = await res.json();
// eslint-disable-next-line no-undef
plausible('Started Game', { props: { quiz_id: id } });
window.location.replace(`/admin?token=${data.game_id}&pin=${data.game_pin}&connect=1`);
window.location.assign(`/admin?token=${data.game_id}&pin=${data.game_pin}&connect=1`);
};
</script>