2 files changed, 25 insertions, 27 deletions
diff --git a/code/app/src/routes/(main)/(public)/reset-password/+page.svelte b/code/app/src/routes/(main)/(public)/reset-password/+page.svelte
index 55859f6..a45ccdd 100644
--- a/code/app/src/routes/(main)/(public)/reset-password/+page.svelte
+++ b/code/app/src/routes/(main)/(public)/reset-password/+page.svelte
@@ -12,7 +12,7 @@
     };
 
     const formError = new FormError();
-    const resetRequests = new PasswordResetService();
+    const passwordResetService = PasswordResetService.resolve();
 
     let loading = false;
     let showSuccessAlert = false;
@@ -23,7 +23,7 @@
         showSuccessAlert = false;
         showErrorAlert = false;
         loading = true;
-        const response = await resetRequests.create_request_async(formData.email.value);
+        const response = await passwordResetService.create_request_async(formData.email.value);
         loading = false;
         if (response.isCreated) {
             showSuccessAlert = true;
@@ -37,17 +37,12 @@
                 }
             }
         } else {
-            formError.title = $LL.unexpectedError();
-            formError.subtitle = $LL.tryAgainSoon();
+            formError.set($LL.unexpectedError(), $LL.tryAgainSoon());
         }
         showErrorAlert = formError.has_error() && !showSuccessAlert;
     }
 </script>
 
-<svlete:head>
-    <title>Reset password - Greatoffice</title>
-</svlete:head>
-
 <div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8">
     <div class="sm:mx-auto sm:w-full p-2 sm:p-0 sm:max-w-md">
         <h2 class="mt-6 text-3xl tracking-tight font-bold text-gray-900">
diff --git a/code/app/src/routes/(main)/(public)/reset-password/[id]/+page.svelte b/code/app/src/routes/(main)/(public)/reset-password/[id]/+page.svelte
index 8f817bf..27a1af5 100644
--- a/code/app/src/routes/(main)/(public)/reset-password/[id]/+page.svelte
+++ b/code/app/src/routes/(main)/(public)/reset-password/[id]/+page.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
-    import {onMount} from "svelte";
+    import { onMount } from "svelte";
     import LL from "$i18n/i18n-svelte";
-    import {Alert, Input, Button} from "$components";
-    import type {PageServerData} from "./$types";
-    import {goto} from "$app/navigation";
-    import {SignInPageMessage, signInPageMessageQueryKey} from "$routes/(main)/(public)/sign-in";
-    import {PasswordResetService} from "$services/password-reset-service";
+    import { Alert, Input, Button } from "$components";
+    import type { PageServerData } from "./$types";
+    import { goto } from "$app/navigation";
+    import { SignInPageMessage, signInPageMessageQueryKey } from "$routes/(main)/(public)/sign-in";
+    import { PasswordResetService } from "$services/password-reset-service";
 
     export let data: PageServerData;
-    const passwordResets = new PasswordResetService();
+    const passwordResetService = PasswordResetService.resolve();
+
     const formData = {
         newPassword: {
             value: "",
@@ -24,7 +25,7 @@
     async function submitFormAsync() {
         if (!canSubmit) return;
         loading = true;
-        const request = await passwordResets.fulfill_request_async(data.resetRequestId, formData.newPassword.value);
+        const request = await passwordResetService.fulfill_request_async(data.resetRequestId, formData.newPassword.value);
         if (request.isFulfilled) {
             goto("/sign-in?" + signInPageMessageQueryKey + "=" + SignInPageMessage.AFTER_PASSWORD_RESET);
         } else if (request.knownProblem) {
@@ -33,7 +34,7 @@
     }
 
     onMount(async () => {
-        const response = await passwordResets.request_is_valid_async(data.resetRequestId);
+        const response = await passwordResetService.request_is_valid_async(data.resetRequestId);
         requestIsInvalid = !response.isValid;
         finishedPreliminaryLoading = true;
     });
@@ -57,19 +58,21 @@
             <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
                 <form class="space-y-6" on:submit|preventDefault={submitFormAsync}>
                     {#if requestIsInvalid}
-                        <Alert title={$LL.resetPasswordPage.invalidRequestTitle()}
-                               message={$LL.resetPasswordPage.invalidRequestMessage()}/>
+                        <Alert
+                            title={$LL.resetPasswordPage.invalidRequestTitle()}
+                            message={$LL.resetPasswordPage.invalidRequestMessage()}
+                        />
                     {/if}
                     <Input
-                            id="password"
-                            name="password"
-                            type="password"
-                            autocomplete="new-password"
-                            required
-                            bind:value={formData.newPassword.value}
-                            label={$LL.resetPasswordPage.newPassword()}
+                        id="password"
+                        name="password"
+                        type="password"
+                        autocomplete="new-password"
+                        required
+                        bind:value={formData.newPassword.value}
+                        label={$LL.resetPasswordPage.newPassword()}
                     />
-                    <Button text={$LL.submit()} type="submit" {loading} fullWidth/>
+                    <Button text={$LL.submit()} type="submit" {loading} fullWidth />
                 </form>
             </div>
         </div>