Merge pull request #635 from Dark-Matter-Labs/staging

Fix hotjar and about page navigation order
Dark-Matter-Labs · Aug 12, 2024 · 0004bb2 · 0004bb2
2 parents 6800e0b + 9930f47
commit 0004bb2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/app/layout.js b/app/layout.js
@@ -43,7 +43,17 @@ export const metadata = {
 
 async function getNavData() {
   const navData = await client.fetch(NAV_QUERY, {
-    next: { tags: ['aboutPages', 'navigation', 'thema', 'simpleThema', 'euLaw', 'siteConfig', 'navigation'] },
+    next: {
+      tags: [
+        'aboutPages',
+        'navigation',
+        'thema',
+        'simpleThema',
+        'euLaw',
+        'siteConfig',
+        'navigation',
+      ],
+    },
   });
   if (!navData) {
     throw new Error('could not fetch navData');

diff --git a/components/layouts/layout.js b/components/layouts/layout.js
@@ -19,10 +19,8 @@ export default function Layout({
 }) {
   const vraagSlug = '/vraag-en-antwoord';
 
-  // const hotjarConsent = getCookie('localConsent');
-
   useEffect(() => {
-    if (hotjarCookie === true) {
+    if (hotjarCookie === 'true') {
       console.log('hotjar turned on');
       hotjar.initialize(Number(process.env.NEXT_PUBLIC_HJID), Number(process.env.NEXT_PUBLIC_HJSV));
     }

diff --git a/lib/queries.js b/lib/queries.js
@@ -404,7 +404,12 @@ export const ABOUT_PAGE_QUERY = `
     pageTitle,
     aboutPageContent,
     slug,
-    "slugs": *[_type == 'aboutPage']{"slug": slug.current, pageTitle}
+    "slugs": *[_type == "siteConfig"][]{
+    'aboutNavItems': overCirculaw->items[]{
+    "slug": navigationItemUrl.internalLink->slug.current,
+    "pageTitle": navigationItemUrl.internalLink->pageTitle
+    }
+  }.aboutNavItems[],
 }
 `;