From 68ca0108116f3ea9f63c37856d3093878c378513 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Fri, 2 Aug 2024 17:54:52 -0400
Subject: [PATCH 01/12] Implement login, logout, name display

---
 arches_lingo/src/arches_lingo/App.vue         | 20 ++++
 arches_lingo/src/arches_lingo/api.ts          | 45 +++++++++
 .../src/arches_lingo/components/HomePage.vue  | 54 +++++++++++
 .../src/arches_lingo/components/LoginPage.vue | 92 +++++++++++++++++++
 arches_lingo/src/arches_lingo/constants.ts    |  2 +
 arches_lingo/src/arches_lingo/types.ts        |  5 +
 arches_lingo/templates/arches_lingo/root.htm  |  2 +-
 7 files changed, 219 insertions(+), 1 deletion(-)
 create mode 100644 arches_lingo/src/arches_lingo/App.vue
 create mode 100644 arches_lingo/src/arches_lingo/api.ts
 create mode 100644 arches_lingo/src/arches_lingo/components/HomePage.vue
 create mode 100644 arches_lingo/src/arches_lingo/components/LoginPage.vue
 create mode 100644 arches_lingo/src/arches_lingo/constants.ts
 create mode 100644 arches_lingo/src/arches_lingo/types.ts

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
new file mode 100644
index 00000000..4d8547e7
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import { ref } from "vue";
+
+import Toast from "primevue/toast";
+
+import HomePage from "@/arches_lingo/components/HomePage.vue";
+import LoginPage from "@/arches_lingo/components/LoginPage.vue";
+
+import type { User } from "@/arches_lingo/types";
+
+const user = ref<User | null>(null);
+</script>
+
+<template>
+    <component
+        :is="user ? HomePage : LoginPage"
+        v-model="user"
+    />
+    <Toast />
+</template>
diff --git a/arches_lingo/src/arches_lingo/api.ts b/arches_lingo/src/arches_lingo/api.ts
new file mode 100644
index 00000000..abbf949b
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/api.ts
@@ -0,0 +1,45 @@
+import arches from "arches";
+import Cookies from "js-cookie";
+
+function getToken() {
+    const token = Cookies.get("csrftoken");
+    if (!token) {
+        throw new Error("Missing csrftoken");
+    }
+    return token;
+}
+
+export const login = async (username: string, password: string) => {
+    const response = await fetch(arches.urls.api_login, {
+        method: "POST",
+        credentials: "include",
+        headers: { "X-CSRFTOKEN": getToken() },
+        body: JSON.stringify({ username, password }),
+    });
+    try {
+        const parsed = await response.json();
+        if (response.ok) {
+            return parsed;
+        }
+        throw new Error(parsed.message);
+    } catch (error) {
+        throw new Error((error as Error).message || response.statusText);
+    }
+};
+
+export const logout = async () => {
+    const response = await fetch(arches.urls.api_logout, {
+        method: "POST",
+        credentials: "include",
+        headers: { "X-CSRFTOKEN": getToken() },
+    });
+    if (response.ok) {
+        return true;
+    }
+    try {
+        const error = await response.json();
+        throw new Error(error.message);
+    } catch (error) {
+        throw new Error((error as Error).message || response.statusText);
+    }
+};
diff --git a/arches_lingo/src/arches_lingo/components/HomePage.vue b/arches_lingo/src/arches_lingo/components/HomePage.vue
new file mode 100644
index 00000000..2aa25774
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/components/HomePage.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { useGettext } from "vue3-gettext";
+
+import { useToast } from "primevue/usetoast";
+import Button from "primevue/button";
+
+import { DEFAULT_ERROR_TOAST_LIFE, ERROR } from "@/arches_lingo/constants.ts";
+import { logout } from "@/arches_lingo/api.ts";
+
+import type { User } from "@/arches_lingo/types";
+
+const user = defineModel<User | null>({ required: true });
+
+const { $gettext } = useGettext();
+const toast = useToast();
+
+const issueLogout = async () => {
+    try {
+        await logout();
+        user.value = null;
+    } catch (error) {
+        toast.add({
+            severity: ERROR,
+            life: DEFAULT_ERROR_TOAST_LIFE,
+            summary: $gettext("Sign out failed."),
+            detail: error instanceof Error ? error.message : undefined,
+        });
+    }
+};
+
+const bestName = computed(() => {
+    if (!user.value) {
+        return "";
+    }
+    // TODO: determine appropriate i18n for this.
+    if (user.value.first_name && user.value.last_name) {
+        return user.value.first_name + " " + user.value.last_name;
+    }
+    return user.value.username;
+});
+</script>
+
+<template>
+    <main>
+        <div style="display: flex; justify-content: space-between">
+            <h1>{{ $gettext("LINGO") }}</h1>
+            <span>{{ $gettext("Hello %{bestName}", { bestName }) }}</span>
+            <Button @click="issueLogout">
+                {{ $gettext("Sign out") }}
+            </Button>
+        </div>
+    </main>
+</template>
diff --git a/arches_lingo/src/arches_lingo/components/LoginPage.vue b/arches_lingo/src/arches_lingo/components/LoginPage.vue
new file mode 100644
index 00000000..da289b1a
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/components/LoginPage.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import arches from "arches";
+import { ref } from "vue";
+import { useGettext } from "vue3-gettext";
+
+import { useToast } from "primevue/usetoast";
+import InputText from "primevue/inputtext";
+import Button from "primevue/button";
+
+import { DEFAULT_ERROR_TOAST_LIFE, ERROR } from "@/arches_lingo/constants.ts";
+import { login } from "@/arches_lingo/api.ts";
+
+import type { User } from "@/arches_lingo/types";
+
+const { $gettext } = useGettext();
+const toast = useToast();
+
+const user = defineModel<User | null>({ required: true });
+const username = ref();
+const password = ref();
+
+const submit = async () => {
+    try {
+        user.value = await login(username.value, password.value);
+    } catch (error) {
+        toast.add({
+            severity: ERROR,
+            life: DEFAULT_ERROR_TOAST_LIFE,
+            summary: $gettext("Sign in failed."),
+            detail: error instanceof Error ? error.message : undefined,
+        });
+    }
+};
+</script>
+
+<template>
+    <div style="margin: 5%">
+        <form>
+            <h1>{{ $gettext("LINGO") }}</h1>
+            <h2>{{ $gettext("Vocabulary management powered by Arches.") }}</h2>
+            <InputText
+                v-model="username"
+                :placeholder="$gettext('Username')"
+                :aria-label="$gettext('Username')"
+                autocomplete="username"
+            />
+            <InputText
+                v-model="password"
+                :placeholder="$gettext('Password')"
+                :aria-label="$gettext('Password')"
+                type="password"
+                autocomplete="password"
+                @keyup.enter="submit"
+            />
+
+            <Button
+                type="button"
+                :label="$gettext('Sign In')"
+                @click="submit"
+            />
+        </form>
+        <div
+            class="spacer"
+            style="height: 10rem"
+        ></div>
+        <div style="display: flex; justify-content: space-between; width: 30%">
+            <Button
+                as="a"
+                :label="$gettext('Register')"
+                :href="arches.urls.signup"
+            />
+            <Button
+                as="a"
+                :label="$gettext('Multi-factor login')"
+                :href="arches.urls.auth"
+            />
+        </div>
+    </div>
+</template>
+
+<style scoped>
+form {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    width: 30%;
+}
+
+input {
+    width: 100%;
+}
+</style>
diff --git a/arches_lingo/src/arches_lingo/constants.ts b/arches_lingo/src/arches_lingo/constants.ts
new file mode 100644
index 00000000..76fb64ae
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/constants.ts
@@ -0,0 +1,2 @@
+export const ERROR = "error";
+export const DEFAULT_ERROR_TOAST_LIFE = 8000;
diff --git a/arches_lingo/src/arches_lingo/types.ts b/arches_lingo/src/arches_lingo/types.ts
new file mode 100644
index 00000000..e226f150
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/types.ts
@@ -0,0 +1,5 @@
+export interface User {
+    first_name: string;
+    last_name: string;
+    username: string;
+}
diff --git a/arches_lingo/templates/arches_lingo/root.htm b/arches_lingo/templates/arches_lingo/root.htm
index d0bf82ed..37ae517d 100644
--- a/arches_lingo/templates/arches_lingo/root.htm
+++ b/arches_lingo/templates/arches_lingo/root.htm
@@ -5,5 +5,5 @@
 {% endblock title %}
 
 {% block body %}
-<div id="lingo-mounting-point"></div>
+<div id="lingo-mounting-point" style="font-family: sans-serif;"></div>
 {% endblock body %}

From e9030d3be9f36909e6786c8106ad560c21cae484 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Mon, 5 Aug 2024 09:56:44 -0400
Subject: [PATCH 02/12] Include CSRF cookie with first GET request

---
 arches_lingo/src/arches_lingo/api.ts | 2 --
 arches_lingo/views.py                | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arches_lingo/src/arches_lingo/api.ts b/arches_lingo/src/arches_lingo/api.ts
index abbf949b..4436cf2f 100644
--- a/arches_lingo/src/arches_lingo/api.ts
+++ b/arches_lingo/src/arches_lingo/api.ts
@@ -12,7 +12,6 @@ function getToken() {
 export const login = async (username: string, password: string) => {
     const response = await fetch(arches.urls.api_login, {
         method: "POST",
-        credentials: "include",
         headers: { "X-CSRFTOKEN": getToken() },
         body: JSON.stringify({ username, password }),
     });
@@ -30,7 +29,6 @@ export const login = async (username: string, password: string) => {
 export const logout = async () => {
     const response = await fetch(arches.urls.api_logout, {
         method: "POST",
-        credentials: "include",
         headers: { "X-CSRFTOKEN": getToken() },
     });
     if (response.ok) {
diff --git a/arches_lingo/views.py b/arches_lingo/views.py
index da927701..cc34ef92 100644
--- a/arches_lingo/views.py
+++ b/arches_lingo/views.py
@@ -6,6 +6,7 @@
 from django.shortcuts import render
 from django.utils.translation import gettext_lazy as _
 from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.generic import View
 
 from arches.app.models.models import (
@@ -200,6 +201,7 @@ def get(self, request):
 
 
 class LingoRootView(BaseManagerView):
+    @method_decorator(ensure_csrf_cookie)
     def get(self, request, graphid=None, resourceid=None):
         context = self.get_context_data(main_script="views/root")
         context["page_title"] = _("Lingo")

From adee24d9e9ce58ed47abe7aa396cdfe12c0b3f94 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Mon, 5 Aug 2024 12:22:16 -0400
Subject: [PATCH 03/12] Add CHANGELOG.md

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..2e602c56
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+-   Add login interface [#13](https://github.com/archesproject/arches-lingo/issues/13)
+
+### Fixed
+
+### Deprecated
+
+### Removed
+
+### Security

From 74711ee7fe88c9ed1a68d46edbeebfbe5867896c Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Fri, 9 Aug 2024 10:40:19 -0400
Subject: [PATCH 04/12] Remove overrides from package.json

---
 package-lock.json | 667 +++++++++++++++++++++++++++++++++++++++++++---
 package.json      |   2 -
 2 files changed, 630 insertions(+), 39 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee072def..25410709 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2307,6 +2307,28 @@
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
+        "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@eslint/config-array/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/@eslint/eslintrc": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
@@ -2330,6 +2352,16 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
+        "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
         "node_modules/@eslint/eslintrc/node_modules/globals": {
             "version": "14.0.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -2342,6 +2374,18 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/@eslint/js": {
             "version": "9.8.0",
             "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz",
@@ -2406,6 +2450,68 @@
                 "url": "https://github.com/sponsors/nzakas"
             }
         },
+        "node_modules/@isaacs/cliui": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "dependencies": {
+                "string-width": "^5.1.2",
+                "string-width-cjs": "npm:string-width@^4.2.0",
+                "strip-ansi": "^7.0.1",
+                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+                "wrap-ansi": "^8.1.0",
+                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+        },
+        "node_modules/@isaacs/cliui/node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
         "node_modules/@istanbuljs/schema": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -2825,6 +2931,15 @@
             "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
             "dev": true
         },
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+            "optional": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/@primeuix/styled": {
             "version": "0.0.5",
             "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.0.5.tgz",
@@ -5162,6 +5277,21 @@
                 }
             }
         },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
             "version": "7.6.3",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -5476,6 +5606,21 @@
                 }
             }
         },
+        "node_modules/@vue/language-core/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/@vue/reactivity": {
             "version": "3.4.37",
             "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.37.tgz",
@@ -5897,7 +6042,6 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -6878,6 +7022,11 @@
             "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
             "dev": true
         },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+        },
         "node_modules/concat-stream": {
             "version": "1.6.2",
             "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
@@ -8202,6 +8351,37 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/del/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/del/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/del/node_modules/globby": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -8227,6 +8407,18 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/del/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/delaunator": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
@@ -8409,6 +8601,11 @@
             "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
             "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
         },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+        },
         "node_modules/editorconfig": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
@@ -8436,6 +8633,21 @@
                 "node": ">=14"
             }
         },
+        "node_modules/editorconfig/node_modules/minimatch": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+            "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/editorconfig/node_modules/semver": {
             "version": "7.6.3",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -8463,8 +8675,7 @@
         "node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
         },
         "node_modules/emojis-list": {
             "version": "3.0.0",
@@ -8896,6 +9107,16 @@
                 "node": ">=10"
             }
         },
+        "node_modules/eslint/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
         "node_modules/eslint/node_modules/eslint-scope": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
@@ -8933,6 +9154,18 @@
                 "node": ">=4.0"
             }
         },
+        "node_modules/eslint/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/espree": {
             "version": "10.1.0",
             "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
@@ -9454,6 +9687,21 @@
                 "is-callable": "^1.1.3"
             }
         },
+        "node_modules/foreground-child": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+            "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+            "dependencies": {
+                "cross-spawn": "^7.0.0",
+                "signal-exit": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/form-data": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -9666,6 +9914,46 @@
                 "node": ">=6"
             }
         },
+        "node_modules/gettext-extractor/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/gettext-extractor/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/gettext-extractor/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/gettext-extractor/node_modules/parse5": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
@@ -9681,25 +9969,6 @@
             "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
             "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
         },
-        "node_modules/glob": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-            "deprecated": "Glob versions prior to v9 are no longer supported",
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^5.0.1",
-                "once": "^1.3.0"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/glob-parent": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -10770,7 +11039,6 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -11094,6 +11362,20 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jackspeak": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
         "node_modules/jest-util": {
             "version": "29.7.0",
             "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
@@ -11210,6 +11492,26 @@
                 "node": ">=14"
             }
         },
+        "node_modules/js-beautify/node_modules/glob": {
+            "version": "10.4.5",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+            "dev": true,
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/js-beautify/node_modules/js-cookie": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
@@ -11219,6 +11521,21 @@
                 "node": ">=14"
             }
         },
+        "node_modules/js-beautify/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/js-cookie": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.1.1.tgz",
@@ -11933,17 +12250,6 @@
             "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
             "dev": true
         },
-        "node_modules/minimatch": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.2.tgz",
-            "integrity": "sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/minimist": {
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
@@ -11965,6 +12271,14 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/minipass": {
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
         "node_modules/mlly": {
             "version": "1.7.1",
             "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
@@ -12143,6 +12457,16 @@
                 "url": "https://opencollective.com/nodemon"
             }
         },
+        "node_modules/nodemon/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
         "node_modules/nodemon/node_modules/has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -12152,6 +12476,18 @@
                 "node": ">=4"
             }
         },
+        "node_modules/nodemon/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/nodemon/node_modules/semver": {
             "version": "7.6.3",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -12524,6 +12860,11 @@
                 "node": ">=6"
             }
         },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+            "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw=="
+        },
         "node_modules/param-case": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
@@ -12632,6 +12973,14 @@
                 "node": ">=8"
             }
         },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/path-is-inside": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
@@ -12651,6 +13000,26 @@
             "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
         },
+        "node_modules/path-scurry": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+            "dependencies": {
+                "lru-cache": "^10.2.0",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/path-scurry/node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+        },
         "node_modules/path-to-regexp": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -13826,6 +14195,41 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
+        "node_modules/rimraf/node_modules/glob": {
+            "version": "10.4.5",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+            "dev": true,
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/rimraf/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/robust-predicates": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-2.0.4.tgz",
@@ -14369,7 +14773,6 @@
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
             "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-            "dev": true,
             "engines": {
                 "node": ">=14"
             },
@@ -14580,7 +14983,20 @@
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs": {
+            "name": "string-width",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -14640,7 +15056,18 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -15165,6 +15592,49 @@
                 "node": ">=8"
             }
         },
+        "node_modules/test-exclude/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/test-exclude/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/test-exclude/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/text-loader": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/text-loader/-/text-loader-0.0.1.tgz",
@@ -16329,6 +16799,39 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
+        "node_modules/vue3-gettext/node_modules/glob": {
+            "version": "10.4.5",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/vue3-gettext/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/vue3-gettext/node_modules/parse5": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
@@ -16822,6 +17325,96 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-regex": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+        },
+        "node_modules/wrap-ansi/node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
         "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index cd34c69b..9bd55ad6 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,6 @@
     "nodeModulesPaths": {
     },
     "overrides": {
-        "glob": "8.1.0",
-        "minimatch": "5.1.2",
         "moment-timezone": "^0.5.45",
         "nomnom": "npm:@gerhobbelt/nomnom",
         "rimraf": "^5.0.7",

From 1b73829798d13f0eaf353f450f5b0186b87191fc Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Fri, 9 Aug 2024 10:59:45 -0400
Subject: [PATCH 05/12] Decompose LoginPage

---
 arches_lingo/src/arches_lingo/App.vue         |  7 +-
 .../src/arches_lingo/components/HomePage.vue  |  7 +-
 .../src/arches_lingo/components/LoginForm.vue | 78 +++++++++++++++++
 .../arches_lingo/components/LoginLinks.vue    | 23 +++++
 .../src/arches_lingo/components/LoginPage.vue | 85 +------------------
 arches_lingo/src/arches_lingo/constants.ts    |  5 ++
 arches_lingo/src/arches_lingo/types.ts        |  8 ++
 7 files changed, 128 insertions(+), 85 deletions(-)
 create mode 100644 arches_lingo/src/arches_lingo/components/LoginForm.vue
 create mode 100644 arches_lingo/src/arches_lingo/components/LoginLinks.vue

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
index 4d8547e7..bcae3577 100644
--- a/arches_lingo/src/arches_lingo/App.vue
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -1,14 +1,19 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { provide, ref } from "vue";
 
 import Toast from "primevue/toast";
 
+import { userKey } from "@/arches_lingo/constants.ts";
 import HomePage from "@/arches_lingo/components/HomePage.vue";
 import LoginPage from "@/arches_lingo/components/LoginPage.vue";
 
 import type { User } from "@/arches_lingo/types";
 
 const user = ref<User | null>(null);
+const setUser = (userToSet: User | null) => {
+    user.value = userToSet;
+};
+provide(userKey, { user, setUser });
 </script>
 
 <template>
diff --git a/arches_lingo/src/arches_lingo/components/HomePage.vue b/arches_lingo/src/arches_lingo/components/HomePage.vue
index 2aa25774..acba313d 100644
--- a/arches_lingo/src/arches_lingo/components/HomePage.vue
+++ b/arches_lingo/src/arches_lingo/components/HomePage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from "vue";
+import { computed, inject } from "vue";
 import { useGettext } from "vue3-gettext";
 
 import { useToast } from "primevue/usetoast";
@@ -7,10 +7,11 @@ import Button from "primevue/button";
 
 import { DEFAULT_ERROR_TOAST_LIFE, ERROR } from "@/arches_lingo/constants.ts";
 import { logout } from "@/arches_lingo/api.ts";
+import { userKey } from "@/arches_lingo/constants.ts";
 
-import type { User } from "@/arches_lingo/types";
+import type { UserRefAndSetter } from "@/arches_lingo/types";
 
-const user = defineModel<User | null>({ required: true });
+const { user } = inject(userKey) as UserRefAndSetter;
 
 const { $gettext } = useGettext();
 const toast = useToast();
diff --git a/arches_lingo/src/arches_lingo/components/LoginForm.vue b/arches_lingo/src/arches_lingo/components/LoginForm.vue
new file mode 100644
index 00000000..742eb488
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/components/LoginForm.vue
@@ -0,0 +1,78 @@
+<script setup lang="ts">
+import { inject, ref } from "vue";
+import { useGettext } from "vue3-gettext";
+
+import { useToast } from "primevue/usetoast";
+import InputText from "primevue/inputtext";
+import Button from "primevue/button";
+
+import { login } from "@/arches_lingo/api.ts";
+import {
+    DEFAULT_ERROR_TOAST_LIFE,
+    ERROR,
+    userKey,
+} from "@/arches_lingo/constants.ts";
+
+import type { UserRefAndSetter } from "@/arches_lingo/types";
+
+const { $gettext } = useGettext();
+const toast = useToast();
+
+const { setUser } = inject(userKey) as UserRefAndSetter;
+const username = ref();
+const password = ref();
+
+const submit = async () => {
+    try {
+        const userToSet = await login(username.value, password.value);
+        setUser(userToSet);
+    } catch (error) {
+        toast.add({
+            severity: ERROR,
+            life: DEFAULT_ERROR_TOAST_LIFE,
+            summary: $gettext("Sign in failed."),
+            detail: error instanceof Error ? error.message : undefined,
+        });
+    }
+};
+</script>
+
+<template>
+    <form>
+        <h1>{{ $gettext("LINGO") }}</h1>
+        <h2>{{ $gettext("Vocabulary management powered by Arches.") }}</h2>
+        <InputText
+            v-model="username"
+            :placeholder="$gettext('Username')"
+            :aria-label="$gettext('Username')"
+            autocomplete="username"
+        />
+        <InputText
+            v-model="password"
+            :placeholder="$gettext('Password')"
+            :aria-label="$gettext('Password')"
+            type="password"
+            autocomplete="password"
+            @keyup.enter="submit"
+        />
+
+        <Button
+            type="button"
+            :label="$gettext('Sign In')"
+            @click="submit"
+        />
+    </form>
+</template>
+
+<style scoped>
+form {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    width: 30%;
+}
+
+input {
+    width: 100%;
+}
+</style>
diff --git a/arches_lingo/src/arches_lingo/components/LoginLinks.vue b/arches_lingo/src/arches_lingo/components/LoginLinks.vue
new file mode 100644
index 00000000..ae154d61
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/components/LoginLinks.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import arches from "arches";
+import { useGettext } from "vue3-gettext";
+
+import Button from "primevue/button";
+
+const { $gettext } = useGettext();
+</script>
+
+<template>
+    <div style="display: flex; justify-content: space-between; width: 30%">
+        <Button
+            as="a"
+            :label="$gettext('Register')"
+            :href="arches.urls.signup"
+        />
+        <Button
+            as="a"
+            :label="$gettext('Multi-factor login')"
+            :href="arches.urls.auth"
+        />
+    </div>
+</template>
diff --git a/arches_lingo/src/arches_lingo/components/LoginPage.vue b/arches_lingo/src/arches_lingo/components/LoginPage.vue
index da289b1a..8c360cce 100644
--- a/arches_lingo/src/arches_lingo/components/LoginPage.vue
+++ b/arches_lingo/src/arches_lingo/components/LoginPage.vue
@@ -1,92 +1,15 @@
 <script setup lang="ts">
-import arches from "arches";
-import { ref } from "vue";
-import { useGettext } from "vue3-gettext";
-
-import { useToast } from "primevue/usetoast";
-import InputText from "primevue/inputtext";
-import Button from "primevue/button";
-
-import { DEFAULT_ERROR_TOAST_LIFE, ERROR } from "@/arches_lingo/constants.ts";
-import { login } from "@/arches_lingo/api.ts";
-
-import type { User } from "@/arches_lingo/types";
-
-const { $gettext } = useGettext();
-const toast = useToast();
-
-const user = defineModel<User | null>({ required: true });
-const username = ref();
-const password = ref();
-
-const submit = async () => {
-    try {
-        user.value = await login(username.value, password.value);
-    } catch (error) {
-        toast.add({
-            severity: ERROR,
-            life: DEFAULT_ERROR_TOAST_LIFE,
-            summary: $gettext("Sign in failed."),
-            detail: error instanceof Error ? error.message : undefined,
-        });
-    }
-};
+import LoginForm from "@/arches_lingo/components/LoginForm.vue";
+import LoginLinks from "@/arches_lingo/components/LoginLinks.vue";
 </script>
 
 <template>
     <div style="margin: 5%">
-        <form>
-            <h1>{{ $gettext("LINGO") }}</h1>
-            <h2>{{ $gettext("Vocabulary management powered by Arches.") }}</h2>
-            <InputText
-                v-model="username"
-                :placeholder="$gettext('Username')"
-                :aria-label="$gettext('Username')"
-                autocomplete="username"
-            />
-            <InputText
-                v-model="password"
-                :placeholder="$gettext('Password')"
-                :aria-label="$gettext('Password')"
-                type="password"
-                autocomplete="password"
-                @keyup.enter="submit"
-            />
-
-            <Button
-                type="button"
-                :label="$gettext('Sign In')"
-                @click="submit"
-            />
-        </form>
+        <LoginForm />
         <div
             class="spacer"
             style="height: 10rem"
         ></div>
-        <div style="display: flex; justify-content: space-between; width: 30%">
-            <Button
-                as="a"
-                :label="$gettext('Register')"
-                :href="arches.urls.signup"
-            />
-            <Button
-                as="a"
-                :label="$gettext('Multi-factor login')"
-                :href="arches.urls.auth"
-            />
-        </div>
+        <LoginLinks />
     </div>
 </template>
-
-<style scoped>
-form {
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
-    width: 30%;
-}
-
-input {
-    width: 100%;
-}
-</style>
diff --git a/arches_lingo/src/arches_lingo/constants.ts b/arches_lingo/src/arches_lingo/constants.ts
index 76fb64ae..e80f9c32 100644
--- a/arches_lingo/src/arches_lingo/constants.ts
+++ b/arches_lingo/src/arches_lingo/constants.ts
@@ -1,2 +1,7 @@
+import type { InjectionKey } from "vue";
+import type { UserRefAndSetter } from "@/arches_lingo/types";
+
 export const ERROR = "error";
 export const DEFAULT_ERROR_TOAST_LIFE = 8000;
+
+export const userKey = Symbol() as InjectionKey<UserRefAndSetter>;
diff --git a/arches_lingo/src/arches_lingo/types.ts b/arches_lingo/src/arches_lingo/types.ts
index e226f150..f9a2e309 100644
--- a/arches_lingo/src/arches_lingo/types.ts
+++ b/arches_lingo/src/arches_lingo/types.ts
@@ -1,5 +1,13 @@
+import type { Ref } from "vue";
+
 export interface User {
     first_name: string;
     last_name: string;
     username: string;
 }
+
+// Prop injection types
+export interface UserRefAndSetter {
+    user: Ref<User | null>;
+    setUser: (userToSet: User | null) => void;
+}

From 328febea636934a1461ae6b93914149109d19337 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Fri, 9 Aug 2024 11:02:07 -0400
Subject: [PATCH 06/12] Organize login components into folder

---
 arches_lingo/src/arches_lingo/App.vue                         | 2 +-
 .../src/arches_lingo/components/{ => login}/LoginForm.vue     | 0
 .../src/arches_lingo/components/{ => login}/LoginLinks.vue    | 0
 .../src/arches_lingo/components/{ => login}/LoginPage.vue     | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arches_lingo/src/arches_lingo/components/{ => login}/LoginForm.vue (100%)
 rename arches_lingo/src/arches_lingo/components/{ => login}/LoginLinks.vue (100%)
 rename arches_lingo/src/arches_lingo/components/{ => login}/LoginPage.vue (61%)

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
index bcae3577..997b8c84 100644
--- a/arches_lingo/src/arches_lingo/App.vue
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -5,7 +5,7 @@ import Toast from "primevue/toast";
 
 import { userKey } from "@/arches_lingo/constants.ts";
 import HomePage from "@/arches_lingo/components/HomePage.vue";
-import LoginPage from "@/arches_lingo/components/LoginPage.vue";
+import LoginPage from "@/arches_lingo/components/login/LoginPage.vue";
 
 import type { User } from "@/arches_lingo/types";
 
diff --git a/arches_lingo/src/arches_lingo/components/LoginForm.vue b/arches_lingo/src/arches_lingo/components/login/LoginForm.vue
similarity index 100%
rename from arches_lingo/src/arches_lingo/components/LoginForm.vue
rename to arches_lingo/src/arches_lingo/components/login/LoginForm.vue
diff --git a/arches_lingo/src/arches_lingo/components/LoginLinks.vue b/arches_lingo/src/arches_lingo/components/login/LoginLinks.vue
similarity index 100%
rename from arches_lingo/src/arches_lingo/components/LoginLinks.vue
rename to arches_lingo/src/arches_lingo/components/login/LoginLinks.vue
diff --git a/arches_lingo/src/arches_lingo/components/LoginPage.vue b/arches_lingo/src/arches_lingo/components/login/LoginPage.vue
similarity index 61%
rename from arches_lingo/src/arches_lingo/components/LoginPage.vue
rename to arches_lingo/src/arches_lingo/components/login/LoginPage.vue
index 8c360cce..65f0e1b2 100644
--- a/arches_lingo/src/arches_lingo/components/LoginPage.vue
+++ b/arches_lingo/src/arches_lingo/components/login/LoginPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import LoginForm from "@/arches_lingo/components/LoginForm.vue";
-import LoginLinks from "@/arches_lingo/components/LoginLinks.vue";
+import LoginForm from "@/arches_lingo/components/login/LoginForm.vue";
+import LoginLinks from "@/arches_lingo/components/login/LoginLinks.vue";
 </script>
 
 <template>

From 8f7fe81e3df8d3b60345a8fa5ad36396a03964c3 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Mon, 12 Aug 2024 17:34:59 -0400
Subject: [PATCH 07/12] Add back root.js

---
 arches_lingo/media/js/views/root.js | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 arches_lingo/media/js/views/root.js

diff --git a/arches_lingo/media/js/views/root.js b/arches_lingo/media/js/views/root.js
new file mode 100644
index 00000000..01a6d364
--- /dev/null
+++ b/arches_lingo/media/js/views/root.js
@@ -0,0 +1,6 @@
+import LingoApp from '@/arches_lingo/App.vue';
+import createVueApplication from 'arches/arches/app/media/js/utils/create-vue-application';
+
+createVueApplication(LingoApp).then(vueApp => {
+    vueApp.mount('#lingo-mounting-point');
+});

From 614ed06bbd08a79fb19cce1b5e8b3dd356ca54d2 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 13 Aug 2024 09:41:48 -0400
Subject: [PATCH 08/12] Move font-family style

---
 arches_lingo/src/arches_lingo/App.vue        | 1 +
 arches_lingo/templates/arches_lingo/root.htm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
index 997b8c84..63dfe1e2 100644
--- a/arches_lingo/src/arches_lingo/App.vue
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -20,6 +20,7 @@ provide(userKey, { user, setUser });
     <component
         :is="user ? HomePage : LoginPage"
         v-model="user"
+        style="font-family: sans-serif"
     />
     <Toast />
 </template>
diff --git a/arches_lingo/templates/arches_lingo/root.htm b/arches_lingo/templates/arches_lingo/root.htm
index 37ae517d..d0bf82ed 100644
--- a/arches_lingo/templates/arches_lingo/root.htm
+++ b/arches_lingo/templates/arches_lingo/root.htm
@@ -5,5 +5,5 @@
 {% endblock title %}
 
 {% block body %}
-<div id="lingo-mounting-point" style="font-family: sans-serif;"></div>
+<div id="lingo-mounting-point"></div>
 {% endblock body %}

From 9fbc35cbb0927c759837e9977c5c0c1251a9c86b Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 13 Aug 2024 09:48:09 -0400
Subject: [PATCH 09/12] Refactor client state

---
 arches_lingo/src/arches_lingo/App.vue                 | 9 ++++-----
 arches_lingo/src/arches_lingo/components/HomePage.vue | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
index 63dfe1e2..9c0ae4b3 100644
--- a/arches_lingo/src/arches_lingo/App.vue
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -17,10 +17,9 @@ provide(userKey, { user, setUser });
 </script>
 
 <template>
-    <component
-        :is="user ? HomePage : LoginPage"
-        v-model="user"
-        style="font-family: sans-serif"
-    />
+    <div style="font-family: sans-serif">
+        <HomePage v-if="user" />
+        <LoginPage v-else />
+    </div>
     <Toast />
 </template>
diff --git a/arches_lingo/src/arches_lingo/components/HomePage.vue b/arches_lingo/src/arches_lingo/components/HomePage.vue
index acba313d..5fac4071 100644
--- a/arches_lingo/src/arches_lingo/components/HomePage.vue
+++ b/arches_lingo/src/arches_lingo/components/HomePage.vue
@@ -11,7 +11,7 @@ import { userKey } from "@/arches_lingo/constants.ts";
 
 import type { UserRefAndSetter } from "@/arches_lingo/types";
 
-const { user } = inject(userKey) as UserRefAndSetter;
+const { user, setUser } = inject(userKey) as UserRefAndSetter;
 
 const { $gettext } = useGettext();
 const toast = useToast();
@@ -19,7 +19,7 @@ const toast = useToast();
 const issueLogout = async () => {
     try {
         await logout();
-        user.value = null;
+        setUser(null);
     } catch (error) {
         toast.add({
             severity: ERROR,

From 30dceca52de210c8147c686f3f4ab64049e253de Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 13 Aug 2024 09:51:57 -0400
Subject: [PATCH 10/12] Use new directory structure

---
 arches_lingo/src/arches_lingo/App.vue                         | 4 ++--
 .../src/arches_lingo/{components => pages}/HomePage.vue       | 0
 .../arches_lingo/{components => pages}/login/LoginPage.vue    | 4 ++--
 .../login => pages/login/components}/LoginForm.vue            | 0
 .../login => pages/login/components}/LoginLinks.vue           | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename arches_lingo/src/arches_lingo/{components => pages}/HomePage.vue (100%)
 rename arches_lingo/src/arches_lingo/{components => pages}/login/LoginPage.vue (60%)
 rename arches_lingo/src/arches_lingo/{components/login => pages/login/components}/LoginForm.vue (100%)
 rename arches_lingo/src/arches_lingo/{components/login => pages/login/components}/LoginLinks.vue (100%)

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
index 9c0ae4b3..041a3ac6 100644
--- a/arches_lingo/src/arches_lingo/App.vue
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -4,8 +4,8 @@ import { provide, ref } from "vue";
 import Toast from "primevue/toast";
 
 import { userKey } from "@/arches_lingo/constants.ts";
-import HomePage from "@/arches_lingo/components/HomePage.vue";
-import LoginPage from "@/arches_lingo/components/login/LoginPage.vue";
+import HomePage from "@/arches_lingo/pages/HomePage.vue";
+import LoginPage from "@/arches_lingo/pages/login/LoginPage.vue";
 
 import type { User } from "@/arches_lingo/types";
 
diff --git a/arches_lingo/src/arches_lingo/components/HomePage.vue b/arches_lingo/src/arches_lingo/pages/HomePage.vue
similarity index 100%
rename from arches_lingo/src/arches_lingo/components/HomePage.vue
rename to arches_lingo/src/arches_lingo/pages/HomePage.vue
diff --git a/arches_lingo/src/arches_lingo/components/login/LoginPage.vue b/arches_lingo/src/arches_lingo/pages/login/LoginPage.vue
similarity index 60%
rename from arches_lingo/src/arches_lingo/components/login/LoginPage.vue
rename to arches_lingo/src/arches_lingo/pages/login/LoginPage.vue
index 65f0e1b2..5640f06f 100644
--- a/arches_lingo/src/arches_lingo/components/login/LoginPage.vue
+++ b/arches_lingo/src/arches_lingo/pages/login/LoginPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import LoginForm from "@/arches_lingo/components/login/LoginForm.vue";
-import LoginLinks from "@/arches_lingo/components/login/LoginLinks.vue";
+import LoginForm from "@/arches_lingo/pages/login/components/LoginForm.vue";
+import LoginLinks from "@/arches_lingo/pages/login/components/LoginLinks.vue";
 </script>
 
 <template>
diff --git a/arches_lingo/src/arches_lingo/components/login/LoginForm.vue b/arches_lingo/src/arches_lingo/pages/login/components/LoginForm.vue
similarity index 100%
rename from arches_lingo/src/arches_lingo/components/login/LoginForm.vue
rename to arches_lingo/src/arches_lingo/pages/login/components/LoginForm.vue
diff --git a/arches_lingo/src/arches_lingo/components/login/LoginLinks.vue b/arches_lingo/src/arches_lingo/pages/login/components/LoginLinks.vue
similarity index 100%
rename from arches_lingo/src/arches_lingo/components/login/LoginLinks.vue
rename to arches_lingo/src/arches_lingo/pages/login/components/LoginLinks.vue

From e493b3019c64b779cf717a2e8e0dc5e23f4aadf3 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 13 Aug 2024 10:10:24 -0400
Subject: [PATCH 11/12] Redirect to root after external auth

---
 .../src/arches_lingo/pages/login/components/LoginLinks.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches_lingo/src/arches_lingo/pages/login/components/LoginLinks.vue b/arches_lingo/src/arches_lingo/pages/login/components/LoginLinks.vue
index ae154d61..7438c82e 100644
--- a/arches_lingo/src/arches_lingo/pages/login/components/LoginLinks.vue
+++ b/arches_lingo/src/arches_lingo/pages/login/components/LoginLinks.vue
@@ -17,7 +17,7 @@ const { $gettext } = useGettext();
         <Button
             as="a"
             :label="$gettext('Multi-factor login')"
-            :href="arches.urls.auth"
+            :href="arches.urls.auth + '?next=/'"
         />
     </div>
 </template>

From c11894dd1d8d72472998016c50dba88363db8532 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 13 Aug 2024 11:08:53 -0400
Subject: [PATCH 12/12] Retrieve logged-in user after refresh/redirect

---
 arches_lingo/src/arches_lingo/App.vue         | 24 ++++------
 arches_lingo/src/arches_lingo/api.ts          | 13 ++++++
 .../src/arches_lingo/pages/PageSwitcher.vue   | 44 +++++++++++++++++++
 3 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 arches_lingo/src/arches_lingo/pages/PageSwitcher.vue

diff --git a/arches_lingo/src/arches_lingo/App.vue b/arches_lingo/src/arches_lingo/App.vue
index 041a3ac6..41fcc183 100644
--- a/arches_lingo/src/arches_lingo/App.vue
+++ b/arches_lingo/src/arches_lingo/App.vue
@@ -1,25 +1,17 @@
 <script setup lang="ts">
-import { provide, ref } from "vue";
-
 import Toast from "primevue/toast";
 
-import { userKey } from "@/arches_lingo/constants.ts";
-import HomePage from "@/arches_lingo/pages/HomePage.vue";
-import LoginPage from "@/arches_lingo/pages/login/LoginPage.vue";
-
-import type { User } from "@/arches_lingo/types";
+import ProgressSpinner from "primevue/progressspinner";
 
-const user = ref<User | null>(null);
-const setUser = (userToSet: User | null) => {
-    user.value = userToSet;
-};
-provide(userKey, { user, setUser });
+import PageSwitcher from "@/arches_lingo/pages/PageSwitcher.vue";
 </script>
 
 <template>
-    <div style="font-family: sans-serif">
-        <HomePage v-if="user" />
-        <LoginPage v-else />
-    </div>
+    <Suspense>
+        <PageSwitcher />
+        <template #fallback>
+            <ProgressSpinner style="display: flex; margin-top: 8rem" />
+        </template>
+    </Suspense>
     <Toast />
 </template>
diff --git a/arches_lingo/src/arches_lingo/api.ts b/arches_lingo/src/arches_lingo/api.ts
index 4436cf2f..454b2295 100644
--- a/arches_lingo/src/arches_lingo/api.ts
+++ b/arches_lingo/src/arches_lingo/api.ts
@@ -41,3 +41,16 @@ export const logout = async () => {
         throw new Error((error as Error).message || response.statusText);
     }
 };
+
+export const fetchUser = async () => {
+    const response = await fetch(arches.urls.api_user);
+    try {
+        const parsed = await response.json();
+        if (response.ok) {
+            return parsed;
+        }
+        throw new Error(parsed.message);
+    } catch (error) {
+        throw new Error((error as Error).message || response.statusText);
+    }
+};
diff --git a/arches_lingo/src/arches_lingo/pages/PageSwitcher.vue b/arches_lingo/src/arches_lingo/pages/PageSwitcher.vue
new file mode 100644
index 00000000..c8d52ab5
--- /dev/null
+++ b/arches_lingo/src/arches_lingo/pages/PageSwitcher.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { provide, ref } from "vue";
+import { useGettext } from "vue3-gettext";
+
+import { useToast } from "primevue/usetoast";
+
+import { fetchUser } from "@/arches_lingo/api.ts";
+import {
+    DEFAULT_ERROR_TOAST_LIFE,
+    ERROR,
+    userKey,
+} from "@/arches_lingo/constants.ts";
+import HomePage from "@/arches_lingo/pages/HomePage.vue";
+import LoginPage from "@/arches_lingo/pages/login/LoginPage.vue";
+
+import type { User } from "@/arches_lingo/types";
+
+const { $gettext } = useGettext();
+const toast = useToast();
+
+const user = ref<User | null>(null);
+const setUser = (userToSet: User | null) => {
+    user.value = userToSet;
+};
+provide(userKey, { user, setUser });
+
+try {
+    setUser(await fetchUser());
+} catch (error) {
+    toast.add({
+        severity: ERROR,
+        life: DEFAULT_ERROR_TOAST_LIFE,
+        summary: $gettext("Login required"), // most likely case is inactive user
+        detail: error instanceof Error ? error.message : undefined,
+    });
+}
+</script>
+
+<template>
+    <div style="font-family: sans-serif">
+        <HomePage v-if="user && user.username !== 'anonymous'" />
+        <LoginPage v-else />
+    </div>
+</template>