Merge pull request #153 from lil-lab/feat/add-ga

Add google analytics
lil-lab · Feb 29, 2024 · 6c2db87 · 6c2db87
2 parents f08a858 + b81f166
commit 6c2db87
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 40 deletions.
diff --git a/apps/recnet/src/app/api/sendDigest/route.ts b/apps/recnet/src/app/api/sendDigest/route.ts
@@ -8,7 +8,7 @@ import WeeklyDigest from "../../../../emails/WeeklyDigest";
 import { render } from "@react-email/render";
 import { NextRequest, NextResponse } from "next/server";
 
-const TEST_USER_IDS = ["GoXnHBhgK8QhcZpki0la"];
+// const TEST_USER_IDS = ["GoXnHBhgK8QhcZpki0la"];
 
 export async function GET(request: NextRequest) {
   if (
@@ -39,9 +39,9 @@ export async function GET(request: NextRequest) {
         const user = res.data;
 
         // test within certain user ids
-        if (!TEST_USER_IDS.includes(user.id)) {
-          return;
-        }
+        // if (!TEST_USER_IDS.includes(user.id)) {
+        //   return;
+        // }
 
         const recs = await getFeedsRecs(user?.id, getLatestCutOff().getTime());
         const recsWithUsers = await getRecsWithUsers(recs);

diff --git a/apps/recnet/src/app/error.tsx b/apps/recnet/src/app/error.tsx
@@ -3,8 +3,7 @@
 import { cn } from "@/utils/cn";
 import { Flex, Text } from "@radix-ui/themes";
 import { RecNetLink } from "@/components/Link";
-
-export const ReportEmailAccount = "[email protected]";
+import { ReportEmailAccount } from "./not-found";
 
 export default function NotFoundPage() {
   return (

diff --git a/apps/recnet/src/app/layout.tsx b/apps/recnet/src/app/layout.tsx
@@ -11,6 +11,7 @@ import "@radix-ui/themes/styles.css";
 import "tailwindcss/tailwind.css";
 import { MobileNavigator } from "./MobileNavigator";
 import { ProgressbarProvider } from "./Progressbar";
+import { GoogleAnalytics } from "@next/third-parties/google";
 
 const sfpro = localFont({
   src: [
@@ -121,6 +122,9 @@ export default async function RootLayout({
   const user = await getUserServerSide();
   return (
     <html lang="en">
+      <GoogleAnalytics
+        gaId={process.env.NEXT_PUBLIC_GA_TRACKING_ID as string}
+      />
       <body className={sfpro.className}>
         <ProgressbarProvider>
           <AuthProvider serverUser={user}>

diff --git a/apps/recnet/src/app/not-found.tsx b/apps/recnet/src/app/not-found.tsx
@@ -1,7 +1,8 @@
 import { cn } from "@/utils/cn";
 import { Flex, Text } from "@radix-ui/themes";
 import { RecNetLink } from "@/components/Link";
-import { ReportEmailAccount } from "@/app/error";
+
+export const ReportEmailAccount = "[email protected]";
 
 export default function NotFoundPage() {
   return (

diff --git a/apps/recnet/src/clientConfig.ts b/apps/recnet/src/clientConfig.ts
diff --git a/apps/recnet/src/clientEnv.ts b/apps/recnet/src/clientEnv.ts
@@ -0,0 +1,32 @@
+import { z } from "zod";
+
+export const clientEnvSchema = z.object({
+  NEXT_PUBLIC_FIREBASE_API_KEY: z.string(),
+  NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: z.string(),
+  NEXT_PUBLIC_FIREBASE_PROJECT_ID: z.string(),
+  NEXT_PUBLIC_FIREBASE_APP_ID: z.string(),
+  NEXT_PUBLIC_GA_TRACKING_ID: z.string(),
+});
+
+const clientEnvRes = clientEnvSchema.safeParse({
+  NEXT_PUBLIC_FIREBASE_API_KEY: process.env.NEXT_PUBLIC_FIREBASE_API_KEY,
+  NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN:
+    process.env.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN,
+  NEXT_PUBLIC_FIREBASE_PROJECT_ID: process.env.NEXT_PUBLIC_FIREBASE_PROJECT_ID,
+  NEXT_PUBLIC_FIREBASE_APP_ID: process.env.NEXT_PUBLIC_FIREBASE_APP_ID,
+  NEXT_PUBLIC_GA_TRACKING_ID: process.env.NEXT_PUBLIC_GA_TRACKING_ID,
+});
+
+if (!clientEnvRes.success) {
+  // console.error(clientEnvRes.error.issues);
+  throw new Error("There is an error with the CLIENT environment variables");
+}
+
+export const clientEnv = clientEnvRes.data;
+
+export const firebaseClientEnv = {
+  apiKey: clientEnvRes.data.NEXT_PUBLIC_FIREBASE_API_KEY,
+  authDomain: clientEnvRes.data.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN,
+  projectId: clientEnvRes.data.NEXT_PUBLIC_FIREBASE_PROJECT_ID,
+  appId: clientEnvRes.data.NEXT_PUBLIC_FIREBASE_APP_ID,
+};
diff --git a/apps/recnet/src/firebase/client.ts b/apps/recnet/src/firebase/client.ts
@@ -1,13 +1,13 @@
 import { initializeApp, getApp, getApps } from "firebase/app";
 import { getAuth } from "firebase/auth";
-import { clientConfig } from "@/clientConfig";
+import { firebaseClientEnv } from "@/clientEnv";
 
 export const getFirebaseApp = () => {
   if (getApps().length) {
     return getApp();
   }
 
-  const app = initializeApp(clientConfig);
+  const app = initializeApp(firebaseClientEnv);
 
   return app;
 };

diff --git a/apps/recnet/src/middleware.ts b/apps/recnet/src/middleware.ts
@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server";
 import { authMiddleware } from "next-firebase-auth-edge";
-import { authConfig } from "./serverConfig";
+import { authConfig } from "./serverEnv";
 
 export async function middleware(request: NextRequest) {
   return authMiddleware(request, {

diff --git a/apps/recnet/src/serverConfig.ts b/apps/recnet/src/serverConfig.ts
diff --git a/apps/recnet/src/serverEnv.ts b/apps/recnet/src/serverEnv.ts
@@ -0,0 +1,54 @@
+import { z } from "zod";
+
+const serverConfigSchema = z.object({
+  USE_SECURE_COOKIES: z.coerce.boolean(),
+  COOKIE_SIGNATURE_KEY: z.string(),
+  FIREBASE_PRIVATE_KEY: z.string().transform((s) => s.replace(/\\n/gm, "\n")),
+  FIREBASE_CLIENT_EMAIL: z.string(),
+  CRON_SECRET: z.string(),
+  NEXT_PUBLIC_FIREBASE_API_KEY: z.string(),
+  NEXT_PUBLIC_FIREBASE_PROJECT_ID: z.string(),
+});
+
+const serverConfigRes = serverConfigSchema.safeParse({
+  USE_SECURE_COOKIES: process.env.USE_SECURE_COOKIES,
+  COOKIE_SIGNATURE_KEY: process.env.COOKIE_SIGNATURE_KEY,
+  FIREBASE_PRIVATE_KEY: process.env.FIREBASE_PRIVATE_KEY,
+  FIREBASE_CLIENT_EMAIL: process.env.FIREBASE_CLIENT_EMAIL,
+  CRON_SECRET: process.env.CRON_SECRET,
+  NEXT_PUBLIC_FIREBASE_API_KEY: process.env.NEXT_PUBLIC_FIREBASE_API_KEY,
+  NEXT_PUBLIC_FIREBASE_PROJECT_ID: process.env.NEXT_PUBLIC_FIREBASE_PROJECT_ID,
+});
+
+if (!serverConfigRes.success) {
+  console.error(serverConfigRes.error.issues);
+  throw new Error("There is an error with the SERVER environment variables");
+  process.exit(1);
+}
+
+export const serverEnv = serverConfigRes.data;
+
+const serverConfig = {
+  useSecureCookies: serverConfigRes.data.USE_SECURE_COOKIES,
+  firebaseApiKey: serverConfigRes.data.NEXT_PUBLIC_FIREBASE_API_KEY,
+  serviceAccount: {
+    projectId: serverConfigRes.data.NEXT_PUBLIC_FIREBASE_PROJECT_ID,
+    clientEmail: serverConfigRes.data.FIREBASE_CLIENT_EMAIL,
+    privateKey: serverConfigRes.data.FIREBASE_PRIVATE_KEY,
+  },
+  cookieSignatureKey: serverConfigRes.data.COOKIE_SIGNATURE_KEY,
+};
+
+export const authConfig = {
+  apiKey: serverConfig.firebaseApiKey,
+  cookieName: "AuthToken",
+  cookieSignatureKeys: [serverConfig.cookieSignatureKey],
+  cookieSerializeOptions: {
+    path: "/",
+    httpOnly: true,
+    secure: serverConfig.useSecureCookies, // Set this to true on HTTPS environments
+    sameSite: "lax" as const,
+    maxAge: 12 * 60 * 60 * 24, // twelve days
+  },
+  serviceAccount: serverConfig.serviceAccount,
+};
diff --git a/apps/recnet/src/utils/getUserServerSide.ts b/apps/recnet/src/utils/getUserServerSide.ts
@@ -1,7 +1,7 @@
 import "server-only";
 import { Tokens, getTokens } from "next-firebase-auth-edge";
 import { cookies } from "next/headers";
-import { authConfig } from "@/serverConfig";
+import { authConfig } from "@/serverEnv";
 import { User } from "@/types/user";
 import { getUserByEmail } from "@/server/user";
 

diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
   "private": true,
   "dependencies": {
     "@hookform/resolvers": "^3.3.4",
+    "@next/third-parties": "^14.1.0",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/themes": "^2.0.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml