From 3552a5e3aa89e6975b579d8943829eef10e1d9be Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Sat, 26 Apr 2025 19:40:02 +0100 Subject: [PATCH] Fix web app issues --- apps/web/package.json | 4 ++++ apps/web/src/app/api/trpc/[trpc]/route.ts | 4 +++- apps/web/src/app/posthog-page-view.tsx | 2 +- pnpm-lock.yaml | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index d1a332ea0..d04ca20fa 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -24,8 +24,10 @@ "@aws-sdk/s3-request-presigner": "^3.645.0", "@hookform/resolvers": "^3.3.1", "@next/bundle-analyzer": "^14.2.25", + "@next/env": "^15.3.1", "@panva/hkdf": "^1.2.1", "@radix-ui/react-radio-group": "^1.2.3", + "@radix-ui/react-select": "^1.2.1", "@radix-ui/react-slot": "^1.1.2", "@radix-ui/react-switch": "^1.0.2", "@rallly/billing": "workspace:*", @@ -36,6 +38,7 @@ "@rallly/posthog": "workspace:*", "@rallly/tailwind-config": "workspace:*", "@rallly/ui": "workspace:*", + "@rallly/utils": "workspace:*", "@sentry/nextjs": "^8.49.0", "@svgr/webpack": "^6.5.1", "@t3-oss/env-nextjs": "^0.11.0", @@ -92,6 +95,7 @@ "@rallly/eslint-config": "workspace:*", "@rallly/tsconfig": "workspace:*", "@types/color-hash": "^1.0.2", + "@types/js-cookie": "^3.0.1", "@types/lodash": "^4.14.178", "@types/react-big-calendar": "^1.8.8", "@types/smoothscroll-polyfill": "^0.3.1", diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.ts index 73956b331..b3eee5a4e 100644 --- a/apps/web/src/app/api/trpc/[trpc]/route.ts +++ b/apps/web/src/app/api/trpc/[trpc]/route.ts @@ -19,7 +19,9 @@ const handler = async (req: NextRequest) => { req, router: appRouter, createContext: async () => { - const locale = getPreferredLocale(req); + const locale = getPreferredLocale({ + acceptLanguageHeader: req.headers.get("accept-language") ?? undefined, + }); const user = session?.user ? { id: session.user.id, diff --git a/apps/web/src/app/posthog-page-view.tsx b/apps/web/src/app/posthog-page-view.tsx index 40d9614be..a2d1fd3b8 100644 --- a/apps/web/src/app/posthog-page-view.tsx +++ b/apps/web/src/app/posthog-page-view.tsx @@ -1,6 +1,6 @@ "use client"; +import { usePostHog } from "@rallly/posthog/client"; import { usePathname, useSearchParams } from "next/navigation"; -import { usePostHog } from "posthog-js/react"; import { useEffect } from "react"; export function PostHogPageView() { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3b697f87e..64016c492 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -183,12 +183,18 @@ importers: '@next/bundle-analyzer': specifier: ^14.2.25 version: 14.2.28 + '@next/env': + specifier: ^15.3.1 + version: 15.3.1 '@panva/hkdf': specifier: ^1.2.1 version: 1.2.1 '@radix-ui/react-radio-group': specifier: ^1.2.3 version: 1.3.4(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-select': + specifier: ^1.2.1 + version: 1.2.2(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-slot': specifier: ^1.1.2 version: 1.2.0(@types/react@18.3.20)(react@18.3.1) @@ -385,6 +391,9 @@ importers: '@types/color-hash': specifier: ^1.0.2 version: 1.0.5 + '@types/js-cookie': + specifier: ^3.0.1 + version: 3.0.6 '@types/lodash': specifier: ^4.14.178 version: 4.17.16 @@ -2194,6 +2203,9 @@ packages: '@next/env@15.2.4': resolution: {integrity: sha512-+SFtMgoiYP3WoSswuNmxJOCwi06TdWE733D+WPjpXIe4LXGULwEaofiiAy6kbS0+XjM5xF5n3lKuBwN2SnqD9g==} + '@next/env@15.3.1': + resolution: {integrity: sha512-cwK27QdzrMblHSn9DZRV+DQscHXRuJv6MydlJRpFSqJWZrTYMLzKDeyueJNN9MGd8NNiUKzDQADAf+dMLXX7YQ==} + '@next/eslint-plugin-next@14.2.28': resolution: {integrity: sha512-GQUPA1bTZy5qZdPV5MOHB18465azzhg8xm5o2SqxMF+h1rWNjB43y6xmIPHG5OV2OiU3WxuINpusXom49DdaIQ==} @@ -10328,6 +10340,8 @@ snapshots: '@next/env@15.2.4': {} + '@next/env@15.3.1': {} + '@next/eslint-plugin-next@14.2.28': dependencies: glob: 10.3.10