+
Login
diff --git a/src/routes/(auth)/password/reset/+page.server.ts b/src/routes/(auth)/password/reset/+page.server.ts
index ab1794c..a3668e9 100644
--- a/src/routes/(auth)/password/reset/+page.server.ts
+++ b/src/routes/(auth)/password/reset/+page.server.ts
@@ -1,41 +1,58 @@
-import { fail, error, type Actions } from '@sveltejs/kit';
-import { zod } from 'sveltekit-superforms/adapters';
-import { setError, superValidate } from 'sveltekit-superforms/server';
-import { redirect } from 'sveltekit-flash-message/server';
-import type { PageServerLoad } from './$types';
-import {resetPasswordEmailSchema, resetPasswordTokenSchema} from "$lib/validations/auth";
-import {StatusCodes} from "$lib/constants/status-codes";
-
-export const load: PageServerLoad = async (event) => {
- return {
- emailForm: await superValidate(zod(resetPasswordEmailSchema)),
- tokenForm: await superValidate(zod(resetPasswordTokenSchema)),
- };
-};
-
-export const actions = {
- passwordReset: async ({ locals, request }) => {
- const emailForm = await superValidate(request, zod(resetPasswordEmailSchema));
- if (!emailForm.valid) {
- return fail(StatusCodes.BAD_REQUEST, { emailForm });
- }
- const error = {};
- // const { error } = await locals.api.iam.login.request.$post({ json: emailRegisterForm.data }).then(locals.parseApiResponse);
- if (error) {
- return setError(emailForm, 'email', error);
- }
- return { emailForm };
- },
- verifyToken: async ({ locals, request }) => {
- const tokenForm = await superValidate(request, zod(resetPasswordTokenSchema));
- if (!tokenForm.valid) {
- return fail(StatusCodes.BAD_REQUEST, { tokenForm });
- }
- const error = {};
- // const { error } = await locals.api.iam.login.verify.$post({ json: emailSignInForm.data }).then(locals.parseApiResponse)
- if (error) {
- return setError(tokenForm, 'token', error);
- }
- redirect(301, '/');
- }
-};
+import { fail, error, type Actions } from '@sveltejs/kit';
+import { zod } from 'sveltekit-superforms/adapters';
+import { setError, superValidate } from 'sveltekit-superforms/server';
+import { redirect } from 'sveltekit-flash-message/server';
+import type { PageServerLoad } from './$types';
+import {resetPasswordEmailSchema, resetPasswordTokenSchema} from "$lib/validations/auth";
+import {StatusCodes} from "$lib/constants/status-codes";
+import {userFullyAuthenticated} from "$lib/server/auth-utils";
+
+export const load: PageServerLoad = async () => {
+ return {
+ emailForm: await superValidate(zod(resetPasswordEmailSchema)),
+ tokenForm: await superValidate(zod(resetPasswordTokenSchema)),
+ };
+};
+
+export const actions = {
+ passwordReset: async (event) => {
+ const { request, locals } = event;
+ const { user, session } = locals;
+
+ if (userFullyAuthenticated(user, session)) {
+ const message = { type: 'success', message: 'You are already signed in' } as const;
+ throw redirect('/', message, event);
+ }
+
+ const emailForm = await superValidate(request, zod(resetPasswordEmailSchema));
+ console.log('emailForm', emailForm);
+ if (!emailForm.valid) {
+ return fail(StatusCodes.BAD_REQUEST, { emailForm });
+ }
+ const error = {};
+ // const { error } = await locals.api.iam.login.request.$post({ json: emailRegisterForm.data }).then(locals.parseApiResponse);
+ if (error) {
+ return setError(emailForm, 'email', error);
+ }
+ return { emailForm };
+ },
+ verifyToken: async (event) => {
+ const { request, locals } = event;
+ const { user, session } = locals;
+ if (userFullyAuthenticated(user, session)) {
+ const message = { type: 'success', message: 'You are already signed in' } as const;
+ throw redirect('/', message, event);
+ }
+
+ const tokenForm = await superValidate(request, zod(resetPasswordTokenSchema));
+ if (!tokenForm.valid) {
+ return fail(StatusCodes.BAD_REQUEST, { tokenForm });
+ }
+ const error = {};
+ // const { error } = await locals.api.iam.login.verify.$post({ json: emailSignInForm.data }).then(locals.parseApiResponse)
+ if (error) {
+ return setError(tokenForm, 'token', error);
+ }
+ redirect(301, '/');
+ }
+};
diff --git a/src/routes/(auth)/password/reset/+page.svelte b/src/routes/(auth)/password/reset/+page.svelte
index 5a836d0..bf85822 100644
--- a/src/routes/(auth)/password/reset/+page.svelte
+++ b/src/routes/(auth)/password/reset/+page.svelte
@@ -1,85 +1,89 @@
-
-
-
-
- Reset Password
- Enter your email to reset your password
-
-
-
- {#if showTokenVerification}
- {@render tokenForm()}
- {:else}
- {@render emailForm()}
- {/if}
-
-
-
-
-{#snippet emailForm()}
-
-{/snippet}
-
-{#snippet tokenForm()}
-
+
+
+
+
+
+ Reset Password
+ Enter your email to reset your password
+
+
+
+ {#if showTokenVerification}
+ {@render tokenForm()}
+ {:else}
+ {@render emailForm()}
+ {/if}
+
+
+
+
+
+{#snippet emailForm()}
+
+{/snippet}
+
+{#snippet tokenForm()}
+
{/snippet}
\ No newline at end of file
diff --git a/src/routes/(auth)/sign-up/+page.svelte b/src/routes/(auth)/sign-up/+page.svelte
index b1aa3a0..7c9551a 100644
--- a/src/routes/(auth)/sign-up/+page.svelte
+++ b/src/routes/(auth)/sign-up/+page.svelte
@@ -12,6 +12,7 @@
import * as Alert from '$lib/components/ui/alert';
import * as Card from '$lib/components/ui/card';
import * as Collapsible from '$lib/components/ui/collapsible';
+ import { send, receive } from '$lib/utils/pageCrossfade';
import { boredState } from '$lib/stores/boredState.js';
export let data;
@@ -38,91 +39,93 @@
Bored Game | Sign Up
-
-
- Signup for an account
-
-
-