Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Image } from "@components/Image"
import { SearchButton, SearchButtonIcon } from "../search/SearchButton"
import { cn } from "common/helpers/classnames"
import { useAuth } from "@ctx/auth/AuthProvider"
import { useOverwolf } from "@ctx/OverwolfProvider"
import { useRouter } from "next/router"
import { useSideNav } from "@ctx/SideNavProvider"

Expand All @@ -20,6 +21,8 @@ export const Header = ({ className }: HeaderProps) => {

const { openSideNav } = useSideNav()

const { isOverwolfContext } = useOverwolf()

const isLandingPage = router.pathname === "/"

return (
Expand Down Expand Up @@ -53,6 +56,9 @@ export const Header = ({ className }: HeaderProps) => {
Container={null}
/>
</AppLink>
{isOverwolfContext && (
<p className="text-accent text-xs">Overwolf</p>
)}
</div>
<div className="flex items-center gap-2">
<SearchButton
Expand Down
1 change: 1 addition & 0 deletions app/overwolf-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="@overwolf/types" />
1 change: 1 addition & 0 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"zod": "^3.20.2"
},
"devDependencies": {
"@overwolf/types": "^3.23.1",
"@tanstack/query-core": "^4.22.0",
"@types/node": "^18.11.18",
"@types/react": "^18.0.26",
Expand Down
39 changes: 21 additions & 18 deletions app/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const BackToTopButton = dynamic(
import { GAScripts } from "common/analytics/GAScripts"
import { KBarProvider } from "kbar"
import { Layout } from "@components/layout/Layout"
import { OverwolfProvider } from "@ctx/OverwolfProvider"
import { PageLoader } from "ui/base/PageLoader"
import { SEO } from "@components/SEO"
import { Searchbox } from "@components/search/Searchbox"
Expand All @@ -46,24 +47,26 @@ const App = ({
</Head>
<SEO title="Corehalla" image="/images/og/main-og.jpg" />
<GAScripts />
<AuthProvider>
<KBarProvider actions={[]} options={{}}>
<SideNavProvider>
<PageLoader>
<div className="flex items-center gap-4">
<span className="text-sm">Loading...</span>
<AnimatedLogo size={32} />
</div>
</PageLoader>
<Toaster />
<Layout>
<Component {...pageProps} />
</Layout>
<Searchbox />
<BackToTopButton />
</SideNavProvider>
</KBarProvider>
</AuthProvider>
<OverwolfProvider>
<AuthProvider>
<KBarProvider actions={[]} options={{}}>
<SideNavProvider>
<PageLoader>
<div className="flex items-center gap-4">
<span className="text-sm">Loading...</span>
<AnimatedLogo size={32} />
</div>
</PageLoader>
<Toaster />
<Layout>
<Component {...pageProps} />
</Layout>
<Searchbox />
<BackToTopButton />
</SideNavProvider>
</KBarProvider>
</AuthProvider>
</OverwolfProvider>
</>
)
}
Expand Down
85 changes: 85 additions & 0 deletions app/providers/OverwolfProvider.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import { createContext, useContext, useEffect, useState } from "react"
import type { ReactNode } from "react"

export type OverwolfContext = {
overwolf: typeof window.overwolf | null
isOverwolfContext: boolean
isLoadingOverwolf: boolean
isOverwolfError: boolean
}

const overwolfContext = createContext<OverwolfContext>({
overwolf: null,
isOverwolfContext: false,
isLoadingOverwolf: false,
isOverwolfError: false,
})

export const useOverwolf = (): OverwolfContext => useContext(overwolfContext)

type OverwolfProviderProps = {
children: ReactNode
}

const isOverwolfLoading = (): boolean => {
return !window.overwolf || !window.overwolf.windows
}

export const waitForOverwolf = (): Promise<void> => {
return new Promise((resolve, reject) => {
if (!isOverwolfLoading()) {
return resolve()
}

let retriesLeft = 10
setInterval(() => {
if (isOverwolfLoading()) {
if (retriesLeft <= 0) {
return reject(new Error("Overwolf failed to load"))
}

retriesLeft--
} else {
resolve()
}
}, 1000)
})
}

export const OverwolfProvider = ({ children }: OverwolfProviderProps) => {
const [isOverwolfContext, setIsOverwolfContext] = useState(false)
const [isLoadingOverwolf, setIsLoadingOverwolf] = useState(true)
const [overwolf, setOverwolf] = useState<typeof window.overwolf | null>(
null,
)
useEffect(() => {
const isOverwolfCtx = navigator.userAgent.includes("OverwolfClient")
setIsOverwolfContext(isOverwolfCtx)
if (!isOverwolfCtx) {
setIsLoadingOverwolf(false)
return
}

waitForOverwolf()
.then(() => {
setOverwolf(window.overwolf)
})
.finally(() => {
setIsLoadingOverwolf(false)
})
}, [])

return (
<overwolfContext.Provider
value={{
isOverwolfContext,
isLoadingOverwolf,
isOverwolfError:
isOverwolfContext && !isLoadingOverwolf && !overwolf,
overwolf,
}}
>
{children}
</overwolfContext.Provider>
)
}
7 changes: 7 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.