Merge pull request #197 from vietredweb/fix-darkmode

Tracking SOP, Fix darkmode

src/AnalyticsNext/handle.tsx

@@ -4,18 +4,19 @@ import { startTracker, endTracker, endTrackerVisibilityState } from '../utils/in
 
 interface AnalyticsHandle {
   router: any;
+  attributes: any;
   children?: ReactNode;
 }
 
-const AnalyticsHandle = ({ router, children }: AnalyticsHandle) => {
+const AnalyticsHandle = ({ router, attributes, children }: AnalyticsHandle) => {
   const AnalyticsStore = React.useContext(AnalyticsContext);
   const endPoint = process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL;
   const [prevRoute, setPrevRoute] = useState<string>('');
   const handleStartTracker = useCallback(
-    async (prevRoute: string) => {
+    async (prevRoute: string, attributes: any) => {
       const referer = prevRoute ? prevRoute : '';
       window['referer'] = referer;
-      const responseStart = await startTracker(endPoint, '', referer);
+      const responseStart = await startTracker(endPoint, '', referer, '', attributes);
       responseStart?.event_uuid && AnalyticsStore.setEventID(responseStart.event_uuid);
       responseStart?.visitor_uuid && AnalyticsStore.setUUID(responseStart.visitor_uuid);
     },
@@ -26,7 +27,7 @@ const AnalyticsHandle = ({ router, children }: AnalyticsHandle) => {
     const init = async () => {
       if (!AnalyticsStore.visitor_uuid) {
         setPrevRoute(router.asPath);
-        await handleStartTracker(router.asPath);
+        await handleStartTracker(router.asPath, attributes);
       }
     };
     init();
@@ -37,7 +38,7 @@ const AnalyticsHandle = ({ router, children }: AnalyticsHandle) => {
       setPrevRoute(router.asPath);
       if (AnalyticsStore.visitor_uuid) {
         endTracker(endPoint, window['event_uuid'], AnalyticsStore.visitor_uuid);
-        await handleStartTracker(prevRoute);
+        await handleStartTracker(prevRoute, attributes);
       }
     };
     router.events.on('routeChangeComplete', handleRouteChange);

src/AnalyticsNext/index.tsx

@@ -6,24 +6,37 @@ import { NextRouter } from 'next/router';
 import dynamic from 'next/dynamic';
 
 const ConsentComponent = dynamic(() => import('../Components/Consent'), { ssr: false });
+const ConsentComponentCustom = dynamic(() => import('../Components/ConsentCustom'), { ssr: false });
 
 interface AnalyticsNext {
   router: NextRouter;
+  attributes: any;
+  customLayout?: boolean;
   children?: ReactNode;
 }
 
-const AnalyticsNext = ({ router, children }: AnalyticsNext) => {
+const AnalyticsNext = ({ router, attributes, customLayout = false, children }: AnalyticsNext) => {
   return (
     <>
       <AnalyticsContextProvider>
-        <AnalyticsHandle router={router}>
+        <AnalyticsHandle router={router} attributes={attributes}>
           {children}
           {process.env.NEXT_PUBLIC_DISABLE_ANALYTICS_CONSENT !== 'true' && (
-            <ConsentComponent
-              endpoint={process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL}
-              networkEnv={process.env.NEXT_PUBLIC_CONCORDIUM_NETWORK}
-              aesirXEndpoint={process.env.NEXT_PUBLIC_ENDPOINT_URL ?? 'https://api.aesirx.io'}
-            />
+            <>
+              {customLayout ? (
+                <ConsentComponentCustom
+                  endpoint={process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL}
+                  networkEnv={process.env.NEXT_PUBLIC_CONCORDIUM_NETWORK}
+                  aesirXEndpoint={process.env.NEXT_PUBLIC_ENDPOINT_URL ?? 'https://api.aesirx.io'}
+                />
+              ) : (
+                <ConsentComponent
+                  endpoint={process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL}
+                  networkEnv={process.env.NEXT_PUBLIC_CONCORDIUM_NETWORK}
+                  aesirXEndpoint={process.env.NEXT_PUBLIC_ENDPOINT_URL ?? 'https://api.aesirx.io'}
+                />
+              )}
+            </>
           )}
         </AnalyticsHandle>
       </AnalyticsContextProvider>