[-]:fix/Cookie banner display

src/components/layout/Layout.tsx

@@ -2,8 +2,8 @@
 import Head from 'next/head';
 import { useRouter } from 'next/router';
 import Script from 'next/script';
-import { INTERNXT_URL, EXCLUDED_PATHS_FOR_BANNER } from '@/constants';
-import { GlobalDialog, useGlobalDialog } from '@/contexts/GlobalUIManager';
+import { INTERNXT_URL } from '@/constants';
+import { useGlobalDialog } from '@/contexts/GlobalUIManager';
 import { handleImpact } from '@/services/impact.service';
 import { saveGclidToCookie } from '@/lib/cookies';
 
@@ -40,11 +40,8 @@
   robots,
 }: LayoutProps) {
   const router = useRouter();
-  const { dialogIsOpen } = useGlobalDialog();
   const pathname = pathnameForSEO ? pathnameForSEO : router.pathname === '/' ? '' : router.pathname;
   const lang = router.locale;
-  const shouldShowBanner = !EXCLUDED_PATHS_FOR_BANNER.includes(pathname) && dialogIsOpen(GlobalDialog.TopBanner);
-
   const langToUpperCase = lang?.toLocaleUpperCase() as string;
   const imagePreview = imageLang.has(langToUpperCase) ? langToUpperCase : 'EN';
 
@@ -111,14 +108,9 @@
         <link rel="alternate" hrefLang="zh-CN" href={`https://internxt.com/zh${pathname}`} />
         <link rel="alternate" hrefLang="zh-TW" href={`https://internxt.com/zh-tw${pathname}`} />
         <link rel="alternate" hrefLang="x-default" href={`https://internxt.com${pathname}`} />
+        <link rel="stylesheet" href="/cookiebanner.style.css" />
       </Head>
 
-      <Script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js" strategy="beforeInteractive" />
-      <Script src="/js/cookiebanner.script.js" strategy="afterInteractive" />
-      <Script id="cookie-banner-init" strategy="afterInteractive">{`
-        $(document).ready(function() { cookieBanner.init(); });
-      `}</Script>
-
       <Script type="application/ld+json" strategy="beforeInteractive">
         {`{
           "@context": "https://schema.org",
@@ -141,6 +133,21 @@
         }`}
       </Script>
 
+      <Script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js" strategy="beforeInteractive" />
+      <Script src="/js/cookiebanner.script.js" strategy="afterInteractive" />
+      <Script id="cookie-banner-init" strategy="afterInteractive">
+        {`
+          var attempts = 0;
+          var initCookie = setInterval(function() {
+            if (window.jQuery && window.cookieBanner) {
+              clearInterval(initCookie);
+              window.cookieBanner.init();
+            }
+            if (++attempts > 50) clearInterval(initCookie);
+          }, 100);
+        `}
+      </Script>
+
       <div className="flex flex-col">{children}</div>
 
       {/* <BFBanner /> */}

src/services/impact.service.ts

@@ -11,6 +11,8 @@
   ip,
   userAgent,
   page,
+  irclickid,
+  utmMedium,
 }: {
   randomUUID: string;
   ip?: string;
@@ -19,6 +21,8 @@
     url: string;
     referrer: string;
   };
+  irclickid?: string | null;
+  utmMedium?: string | null;
 }): Promise<void> => {
   const nowInTimestamp = moment().format('YYYY-MM-DDTHH:mm:ss.sssZ');
 
@@ -31,6 +35,12 @@
       page,
     },
     type: 'page',
+    ...(irclickid && {
+      properties: {
+        irclickid,
+        ...(utmMedium && { partner_id: utmMedium }),
+      },
+    }),
   });
 };
 
@@ -54,6 +64,11 @@
     console.warn('IP lookup service unavailable, defaulting to undefined', error);
     ip = undefined;
   }
+
+  const urlParams = new URLSearchParams(window.location.search);
+  const irclickid = urlParams.get('irclickid');
+  const utmMedium = urlParams.get('utm_medium');
+
   const impactAnonymousId = getCookie('impactAnonymousId');
   const randomUUID = impactAnonymousId ?? crypto.randomUUID();
 
@@ -63,11 +78,29 @@
   const anonymousDate = new Date();
   anonymousDate.setFullYear(anonymousDate.getFullYear() + 10);
 
+  const trackingExpiration = new Date();
+  trackingExpiration.setDate(trackingExpiration.getDate() + 30);
+
   document.cookie = `impactSource=${source};expires=${expirationDate.toUTCString()};domain=${COOKIE_DOMAIN};Path=/`;
   document.cookie = `impactAnonymousId=${randomUUID};expires=${anonymousDate.toUTCString()};domain=${COOKIE_DOMAIN};Path=/`;
 
+  if (irclickid) {
+    document.cookie = `impactClickId=${irclickid};expires=${trackingExpiration.toUTCString()};domain=${COOKIE_DOMAIN};Path=/`;
+  }
+
+  if (utmMedium) {
+    document.cookie = `impactPartnerId=${utmMedium};expires=${trackingExpiration.toUTCString()};domain=${COOKIE_DOMAIN};Path=/`;
+  }
+
   try {
-    await sendImpactTrack({ randomUUID, ip, userAgent, page });
+    await sendImpactTrack({
+      randomUUID,
+      ip,
+      userAgent,
+      page,
+      irclickid,
+      utmMedium,
+    });
   } catch (error) {
     console.warn('Analytics tracking failed:', error);
   }