diff --git a/.gitignore b/.gitignore index 9ebde9f5fa0..1d7e04272ad 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ *.sw? /backend/tests/regression/answer_quality/search_test_config.yaml env.sh -.cursorrules \ No newline at end of file +.cursorrules +danswer_checkpoint/ \ No newline at end of file diff --git a/web/package-lock.json b/web/package-lock.json index 338cf0a9f0f..d881f49bba0 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -11,6 +11,7 @@ "@dnd-kit/core": "^6.1.0", "@dnd-kit/modifiers": "^7.0.0", "@dnd-kit/sortable": "^8.0.0", + "@next/third-parties": "latest", "@phosphor-icons/react": "^2.0.8", "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-popover": "^1.0.7", @@ -1095,6 +1096,19 @@ "node": ">= 10" } }, + "node_modules/@next/third-parties": { + "version": "15.0.3", + "resolved": "https://registry.npmjs.org/@next/third-parties/-/third-parties-15.0.3.tgz", + "integrity": "sha512-T2NkBXLcgRY0cmE7jb/dSMXNK9D+yv1k+n0uBxwMBS9SEtOhuMvxiUPQRj5x4cFnsei6JECloJg88koMprKw0A==", + "license": "MIT", + "dependencies": { + "third-party-capital": "1.0.20" + }, + "peerDependencies": { + "next": "^13.0.0 || ^14.0.0 || ^15.0.0", + "react": "^18.2.0 || 19.0.0-rc-66855b96-20241106" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -10890,6 +10904,12 @@ "node": ">=0.8" } }, + "node_modules/third-party-capital": { + "version": "1.0.20", + "resolved": "https://registry.npmjs.org/third-party-capital/-/third-party-capital-1.0.20.tgz", + "integrity": "sha512-oB7yIimd8SuGptespDAZnNkzIz+NWaJCu2RMsbs4Wmp9zSDUM8Nhi3s2OOcqYuv3mN4hitXc8DVx+LyUmbUDiA==", + "license": "ISC" + }, "node_modules/tiny-case": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz", diff --git a/web/package.json b/web/package.json index 190ec9b1aa6..eaf0451ff26 100644 --- a/web/package.json +++ b/web/package.json @@ -29,6 +29,7 @@ "js-cookie": "^3.0.5", "lodash": "^4.17.21", "mdast-util-find-and-replace": "^3.0.1", + "@next/third-parties": "latest", "next": "^14.2.3", "npm": "^10.8.0", "postcss": "^8.4.31", diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index df9c3fd5d92..f69381bd504 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -4,11 +4,7 @@ import { fetchEnterpriseSettingsSS, fetchSettingsSS, } from "@/components/settings/lib"; -import { - CUSTOM_ANALYTICS_ENABLED, - EE_ENABLED, - SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED, -} from "@/lib/constants"; +import { SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED } from "@/lib/constants"; import { SettingsProvider } from "@/components/settings/SettingsProvider"; import { Metadata } from "next"; import { buildClientUrl, fetchSS } from "@/lib/utilsSS"; @@ -20,6 +16,7 @@ import { HeaderTitle } from "@/components/header/HeaderTitle"; import { Logo } from "@/components/Logo"; import { UserProvider } from "@/components/user/UserProvider"; import { ProviderContextProvider } from "@/components/chat_search/ProviderContext"; +import GTMProvider from "@/components/GTMProvider"; const inter = Inter({ subsets: ["latin"], @@ -40,7 +37,8 @@ export async function generateMetadata(): Promise { return { title: enterpriseSettings?.application_name ?? "Eve AI", - description: "With Eve, you can quickly access the information you need to succeed in Mindvalley", + description: + "With Eve, you can quickly access the information you need to succeed in Mindvalley", icons: { icon: logoLocation, }, @@ -99,31 +97,22 @@ export default async function RootLayout({ /> - {CUSTOM_ANALYTICS_ENABLED && combinedSettings.customAnalyticsScript && ( - -