diff --git a/index.html b/index.html
index 4325746f..15c68508 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,8 @@
- Engage-HF
+
+ ENGAGE-HF
diff --git a/modules/firebase/app.ts b/modules/firebase/app.ts
index 2785f189..f3382665 100644
--- a/modules/firebase/app.ts
+++ b/modules/firebase/app.ts
@@ -12,7 +12,6 @@ import { queryOptions } from '@tanstack/react-query'
import { redirect } from '@tanstack/react-router'
import { connectAuthEmulator, getAuth, OAuthProvider } from 'firebase/auth'
import { connectFirestoreEmulator, getFirestore } from 'firebase/firestore'
-import { queryClient } from '@/app/ReactQueryClientProvider'
import { env } from '@/env'
import { firebaseConfig } from '@/modules/firebase/config'
import {
@@ -21,6 +20,7 @@ import {
getDocDataOrThrow,
getDocumentsRefs,
} from '@/modules/firebase/utils'
+import { queryClient } from '@/modules/query/queryClient'
const firebaseApp = initializeApp(firebaseConfig)
diff --git a/app/globals.css b/modules/globals.css
similarity index 100%
rename from app/globals.css
rename to modules/globals.css
diff --git a/app/ReactQueryClientProvider.tsx b/modules/query/ReactQueryClientProvider.tsx
similarity index 74%
rename from app/ReactQueryClientProvider.tsx
rename to modules/query/ReactQueryClientProvider.tsx
index 819731d8..b921b89c 100644
--- a/app/ReactQueryClientProvider.tsx
+++ b/modules/query/ReactQueryClientProvider.tsx
@@ -5,19 +5,14 @@
//
// SPDX-License-Identifier: MIT
//
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { QueryClientProvider } from '@tanstack/react-query'
import { type ReactNode } from 'react'
+import { queryClient } from '@/modules/query/queryClient'
interface ReactQueryClientProviderProps {
children: ReactNode
}
-export const queryClient = new QueryClient({
- defaultOptions: {
- queries: { retry: false },
- },
-})
-
export const ReactQueryClientProvider = ({
children,
}: ReactQueryClientProviderProps) => (
diff --git a/modules/query/queryClient.ts b/modules/query/queryClient.ts
new file mode 100644
index 00000000..98e679c4
--- /dev/null
+++ b/modules/query/queryClient.ts
@@ -0,0 +1,14 @@
+//
+// This source file is part of the Stanford Biodesign Digital Health ENGAGE-HF open-source project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University and the project authors (see CONTRIBUTORS.md)
+//
+// SPDX-License-Identifier: MIT
+//
+import { QueryClient } from '@tanstack/react-query'
+
+export const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false },
+ },
+})
diff --git a/modules/user/queries.tsx b/modules/user/queries.tsx
index cdea57de..47b12316 100644
--- a/modules/user/queries.tsx
+++ b/modules/user/queries.tsx
@@ -8,7 +8,6 @@
import { UserType } from '@stanfordbdhg/engagehf-models'
import { queryOptions } from '@tanstack/react-query'
import { query, where } from 'firebase/firestore'
-import { queryClient } from '@/app/ReactQueryClientProvider'
import { docRefs, getCurrentUser, refs } from '@/modules/firebase/app'
import { type Invitation, type Organization } from '@/modules/firebase/models'
import { mapAuthData } from '@/modules/firebase/user'
@@ -18,6 +17,7 @@ import {
getDocsData,
type UserAuthenticationInformation,
} from '@/modules/firebase/utils'
+import { queryClient } from '@/modules/query/queryClient'
export const getNonAdminInvitations = (organizationIds: string[]) =>
query(
diff --git a/app/favicon.ico b/public/favicon.ico
similarity index 100%
rename from app/favicon.ico
rename to public/favicon.ico
diff --git a/app/favicon.ico.license b/public/favicon.ico.license
similarity index 100%
rename from app/favicon.ico.license
rename to public/favicon.ico.license
diff --git a/routes/~__root.tsx b/routes/~__root.tsx
index bec50945..5100d6a8 100644
--- a/routes/~__root.tsx
+++ b/routes/~__root.tsx
@@ -5,14 +5,14 @@
//
// SPDX-License-Identifier: MIT
//
-import '../app/globals.css'
+import '../modules/globals.css'
import { createRootRoute, Outlet, redirect } from '@tanstack/react-router'
import { NextIntlClientProvider } from 'next-intl'
import { useLayoutEffect } from 'react'
-import { ReactQueryClientProvider } from '@/app/ReactQueryClientProvider'
import { auth } from '@/modules/firebase/app'
import { AuthProvider } from '@/modules/firebase/AuthProvider'
import messages from '@/modules/messages/translations/en.json'
+import { ReactQueryClientProvider } from '@/modules/query/ReactQueryClientProvider'
import { routes } from '@/modules/routes'
import { lightTheme } from '@/packages/design-system/src'
import { Toaster } from '@/packages/design-system/src/components/Toaster'
diff --git a/routes/~_dashboard.tsx b/routes/~_dashboard.tsx
index 15b29d2c..08a18258 100644
--- a/routes/~_dashboard.tsx
+++ b/routes/~_dashboard.tsx
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: MIT
//
import { createFileRoute } from '@tanstack/react-router'
-import { queryClient } from '@/app/ReactQueryClientProvider'
import { currentUserQueryOptions } from '@/modules/firebase/UserProvider'
+import { queryClient } from '@/modules/query/queryClient'
export const Route = createFileRoute('/_dashboard')({
loader: () => queryClient.ensureQueryData(currentUserQueryOptions()),
diff --git a/routes/~_dashboard/~patients/utils.ts b/routes/~_dashboard/~patients/utils.ts
index 6eb0219f..3583219e 100644
--- a/routes/~_dashboard/~patients/utils.ts
+++ b/routes/~_dashboard/~patients/utils.ts
@@ -13,7 +13,6 @@ import {
} from '@stanfordbdhg/engagehf-models'
import { groupBy } from 'es-toolkit'
import { query, where } from 'firebase/firestore'
-import { queryClient } from '@/app/ReactQueryClientProvider'
import { AllergyType } from '@/modules/firebase/allergy'
import { getCurrentUser, refs } from '@/modules/firebase/app'
import { type FHIRAllergyIntolerance } from '@/modules/firebase/models'
@@ -23,6 +22,7 @@ import {
ObservationType,
type ResourceType,
} from '@/modules/firebase/utils'
+import { queryClient } from '@/modules/query/queryClient'
import { userOrganizationQueryOptions } from '@/modules/user/queries'
const getUserClinicians = async () => {
diff --git a/routes/~_dashboard/~users/~$id.tsx b/routes/~_dashboard/~users/~$id.tsx
index f5823d54..91ac6c87 100644
--- a/routes/~_dashboard/~users/~$id.tsx
+++ b/routes/~_dashboard/~users/~$id.tsx
@@ -9,9 +9,9 @@ import { updateDoc } from '@firebase/firestore'
import { UserType } from '@stanfordbdhg/engagehf-models'
import { createFileRoute, notFound, useRouter } from '@tanstack/react-router'
import { Users } from 'lucide-react'
-import { queryClient } from '@/app/ReactQueryClientProvider'
import { callables, docRefs, ensureType } from '@/modules/firebase/app'
import { getDocDataOrThrow } from '@/modules/firebase/utils'
+import { queryClient } from '@/modules/query/queryClient'
import {
getUserData,
userOrganizationQueryOptions,
diff --git a/routes/~_dashboard/~users/~invite.tsx b/routes/~_dashboard/~users/~invite.tsx
index 02d61ec9..8cc09f9c 100644
--- a/routes/~_dashboard/~users/~invite.tsx
+++ b/routes/~_dashboard/~users/~invite.tsx
@@ -8,8 +8,8 @@
import { UserType } from '@stanfordbdhg/engagehf-models'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { Users } from 'lucide-react'
-import { queryClient } from '@/app/ReactQueryClientProvider'
import { callables, ensureType } from '@/modules/firebase/app'
+import { queryClient } from '@/modules/query/queryClient'
import { routes } from '@/modules/routes'
import { userOrganizationQueryOptions } from '@/modules/user/queries'
import { PageTitle } from '@/packages/design-system/src/molecules/DashboardLayout'