.

5 files changed, 12 insertions, 11 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 aa26892..32d4e21 100644
--- a/code/app/src/routes/(main)/(public)/reset-password/+page.svelte
+++ b/code/app/src/routes/(main)/(public)/reset-password/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { create_forgot_password_request } from "$lib/api/user";
+    import { create_forgot_password_request } from "$lib/api/account";
     import { Alert, Input, Button } from "$lib/components";
     import LL from "$lib/i18n/i18n-svelte";
     import type { ErrorResult } from "$lib/models/ErrorResult";
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 c5044b5..3710290 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,5 +1,5 @@
 <script lang="ts">
-    import { check_forgot_password_request, fulfill_forgot_password_request } from "$lib/api/user";
+    import { check_forgot_password_request, fulfill_forgot_password_request } from "$lib/api/account";
     import { onMount } from "svelte";
     import LL from "$lib/i18n/i18n-svelte";
     import { Alert, Input, Button } from "$lib/components";
diff --git a/code/app/src/routes/(main)/(public)/sign-in/+page.svelte b/code/app/src/routes/(main)/(public)/sign-in/+page.svelte
index 0e9c07b..d7a8c5a 100644
--- a/code/app/src/routes/(main)/(public)/sign-in/+page.svelte
+++ b/code/app/src/routes/(main)/(public)/sign-in/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import { goto } from "$app/navigation";
-    import { login } from "$lib/api/user";
+    import { login } from "$lib/api/account";
     import { Button, Checkbox, Input, Alert } from "$lib/components";
     import LL from "$lib/i18n/i18n-svelte";
     import type { ErrorResult } from "$lib/models/internal/ErrorResult";
-    import type { LoginPayload } from "$lib/models/internal/LoginPayload";
+    import type { LoginPayload } from "$lib/api/account/models/LoginPayload";
     import pwKey from "$actions/pwKey";
     import { onMount } from "svelte";
     import { messageQueryKey, signInPageTestKeys, type Message } from ".";
diff --git a/code/app/src/routes/(main)/(public)/sign-in/index.ts b/code/app/src/routes/(main)/(public)/sign-in/index.ts
index cbdcbf6..c1a1929 100644
--- a/code/app/src/routes/(main)/(public)/sign-in/index.ts
+++ b/code/app/src/routes/(main)/(public)/sign-in/index.ts
@@ -1,18 +1,19 @@
-export enum Message {
+export enum SignInPageMessage {
     AFTER_PASSWORD_RESET = "after-password-reset",
     USER_INACTIVITY = "user-inactivity",
     USER_DISABLED = "user-disabled",
+    LOGGED_OUT = "logged-out"
 }
 
-export const messageQueryKey = "m";
+export const signInPageMessageQueryKey = "m";
 export const signInPageTestKeys = {
     passwordInput: "password-input",
     usernameInput: "username-input",
     rememberMeCheckbox: "remember-me-checkbox",
     signInForm: "sign-in-form",
-    userInactivityAlert: Message.USER_INACTIVITY + "-alert",
-    userDisabledAlert: Message.USER_DISABLED + "-alert",
-    afterPasswordResetAlert: Message.AFTER_PASSWORD_RESET + "-alert",
+    userInactivityAlert: SignInPageMessage.USER_INACTIVITY + "-alert",
+    userDisabledAlert: SignInPageMessage.USER_DISABLED + "-alert",
+    afterPasswordResetAlert: SignInPageMessage.AFTER_PASSWORD_RESET + "-alert",
     formErrorAlert: "form-error-alert",
     resetPasswordAnchor: "reset-password-anchor",
     signUpAnchor: "sign-up-anchor",
diff --git a/code/app/src/routes/(main)/(public)/sign-up/+page.svelte b/code/app/src/routes/(main)/(public)/sign-up/+page.svelte
index f2f1695..f2b0d7f 100644
--- a/code/app/src/routes/(main)/(public)/sign-up/+page.svelte
+++ b/code/app/src/routes/(main)/(public)/sign-up/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { goto } from "$app/navigation";
-    import { create_account } from "$lib/api/user";
+    import { create_account } from "$lib/api/account";
     import { Button, Input, Alert } from "$lib/components";
     import LL from "$lib/i18n/i18n-svelte";
-    import type { CreateAccountPayload } from "$lib/models/internal/CreateAccountPayload";
+    import type { CreateAccountPayload } from "$lib/api/account/models/CreateAccountPayload";
     import type { ErrorResult } from "$lib/models/internal/ErrorResult";
 
     const formData = {