🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor environment detection in layout and hooks for improved clarity
Bill Yang99423c9352d9
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsxindex 04e23845f..8c12a4f24 100644--- a/client/src/app/layout.tsx+++ b/client/src/app/layout.tsx@@ -8,7 +8,7 @@ import { cn } from "../lib/utils";import "./globals.css";import Script from "next/script";import { useStopImpersonation } from "@/hooks/useStopImpersonation";-import { useIsProduction } from "@/hooks/useIsProduction";+import { useAppEnv } from "@/hooks/useIsProduction";import { ReactScan } from "./ReactScan";import { OrganizationInitializer } from "../components/OrganizationInitializer";import { AuthenticationGuard } from "../components/AuthenticationGuard";@@ -21,7 +21,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })// Use the hook to expose stopImpersonating globallyuseStopImpersonation();- const { isProduction, isAppProduction } = useIsProduction();+ const appEnv = useAppEnv();return (<html lang="en" suppressHydrationWarning>@@ -38,17 +38,11 @@ export default function RootLayout({ children }: { children: React.ReactNode })<Toaster /></TooltipProvider></ThemeProvider>- {isAppProduction && (- <>- <Script- src="https://demo.rybbit.com/api/script.js"- data-site-id="21"- strategy="afterInteractive"- data-web-vitals="true"- data-track-errors="true"- data-session-replay="true"- />- </>+ {appEnv === "prod" && (+ <Script src="https://demo.rybbit.com/api/script.js" data-site-id="21" strategy="afterInteractive" />+ )}+ {appEnv === "demo" && (+ <Script src="https://demo.rybbit.com/api/script.js" data-site-id="22" strategy="afterInteractive" />)}</body></NuqsAdapter>diff --git a/client/src/hooks/useIsProduction.ts b/client/src/hooks/useIsProduction.tsindex a519072d0..90f492c6c 100644--- a/client/src/hooks/useIsProduction.ts+++ b/client/src/hooks/useIsProduction.ts@@ -1,7 +1,12 @@-export function useIsProduction() {+export function useAppEnv() {const hostname = typeof window !== "undefined" ? window.location.hostname : "";- const isProduction = hostname === "demo.rybbit.com" || hostname === "app.rybbit.io";- const isAppProduction = hostname === "app.rybbit.io";- return { isProduction, isAppProduction };+ if (hostname === "demo.rybbit.com") {+ return "demo";+ }+ if (hostname === "app.rybbit.io") {+ return "prod";+ }++ return null;}