Merge branch 'master' of git.bizmatch.net:tknuth/QR-master

docker-compose.yml

@@ -91,6 +91,8 @@ services:
       R2_SECRET_ACCESS_KEY: ${R2_SECRET_ACCESS_KEY:-}
       R2_BUCKET_NAME: ${R2_BUCKET_NAME:-qrmaster-menus}
       R2_PUBLIC_URL: ${R2_PUBLIC_URL:-}
+      NEXT_PUBLIC_UMAMI_SRC: ${NEXT_PUBLIC_UMAMI_SRC:-}
+      NEXT_PUBLIC_UMAMI_ID: ${NEXT_PUBLIC_UMAMI_ID:-}      
     depends_on:
       db:
         condition: service_healthy

src/app/(main)/layout.tsx

@@ -20,6 +20,7 @@ export const metadata: Metadata = {
     : { index: false, follow: false },
   icons: {
     icon: [
+
       { url: '/favicon.svg', type: 'image/svg+xml' },
       { url: '/favicon.ico', sizes: '16x16 32x32', type: 'image/x-icon' },
     ],
@@ -64,6 +65,14 @@ export default function RootLayout({
               <FacebookPixel />
             </Suspense>
             {children}
+            {process.env.NEXT_PUBLIC_UMAMI_SRC && process.env.NEXT_PUBLIC_UMAMI_ID && (
+              <Script
+                defer
+                src={process.env.NEXT_PUBLIC_UMAMI_SRC}
+                data-website-id={process.env.NEXT_PUBLIC_UMAMI_ID}
+                strategy="afterInteractive"
+              />
+            )}            
           </Providers>
         </Suspense>