Merge pull request #161 from sgcarstrends/hotfix/analytics

Add Umami Analytics

app/layout.tsx

@@ -1,12 +1,14 @@
 import React from "react";
 import { Inter } from "next/font/google";
+import Script from "next/script";
 import { GoogleAnalytics } from "@next/third-parties/google";
 import classNames from "classnames";
 import { Announcement } from "@/app/components/Announcement";
 import { Footer } from "@/app/components/Footer";
 import { Header } from "@/app/components/Header";
 import { ANNOUNCEMENT, SITE_TITLE, SITE_URL } from "@/config";
 import "./globals.css";
+import { AppEnv } from "@/types";
 import { Analytics } from "./components/Analytics";
 import type { Metadata } from "next";
 
@@ -56,6 +58,12 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => {
         <Footer />
         <Analytics />
       </body>
+      <Script
+        defer
+        src="https://analytics.sgcarstrends.com/script.js"
+        data-website-id="b98dda44-ccc9-4a73-87d4-dcbe561aedb8"
+        data-domains="sgcarstrends.com"
+      />
       <GoogleAnalytics gaId={gaMeasurementId} />
     </html>
   );

config/index.ts

@@ -1,7 +1,7 @@
 import { Battery, Droplet, Fuel, Zap } from "lucide-react";
 import type { AppEnv, LinkItem } from "@/types";
 
-const DOMAIN_NAME = "sgcarstrends.com";
+export const DOMAIN_NAME = "sgcarstrends.com";
 const API_VERSION = "v1";
 
 export const SITE_URL =

middleware.ts

@@ -1,10 +1,11 @@
 import { NextRequest, NextResponse } from "next/server";
+import { DOMAIN_NAME } from "@/config";
 
 export const middleware = (request: NextRequest) => {
   const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
   const cspHeader = `
     default-src 'self';
-    script-src 'self' 'unsafe-eval' 'unsafe-inline' *.googletagmanager.com;
+    script-src 'self' 'unsafe-eval' 'unsafe-inline' *.${DOMAIN_NAME} *.googletagmanager.com;
     style-src 'self' 'unsafe-inline';
     img-src 'self' blob: data:;
     connect-src *;