From aae6d8ee75297cc03b0ce3c740707b4edd9e6688 Mon Sep 17 00:00:00 2001 From: hudson-newey Date: Sat, 20 Apr 2024 21:16:51 +1000 Subject: [PATCH] Fix tripple GA on blog pages --- src/components/BlogFooter.astro | 3 --- src/components/CookieConsent.astro | 21 ++++++++++++++++- src/layouts/BlogArticle.astro | 38 +++++++++++++++++++++++++----- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/src/components/BlogFooter.astro b/src/components/BlogFooter.astro index 6658156..1094afa 100644 --- a/src/components/BlogFooter.astro +++ b/src/components/BlogFooter.astro @@ -1,7 +1,6 @@ --- import SocialsContainer from "./SocialsContainer.astro"; import SuggestedArticles from "./SuggestedArticles.astro"; -import CookieConsent from "./CookieConsent.astro"; ---
@@ -10,6 +9,4 @@ import CookieConsent from "./CookieConsent.astro";
- -
diff --git a/src/components/CookieConsent.astro b/src/components/CookieConsent.astro index 06a99bd..c3cb4a2 100644 --- a/src/components/CookieConsent.astro +++ b/src/components/CookieConsent.astro @@ -18,9 +18,9 @@
OK @@ -62,6 +62,21 @@ function removeCookieConsentBanner() { } } +function createConsentCookie() { + // get the current date in the format "day month (in text) year" + let date = new Date(); + + let day = date.getDate(); + let month = date.getMonth(); + let year = date.getFullYear() + 1; + let monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; + let dateString = day + " " + monthNames[month] + " " + year; + // create the cookie + document.cookie = "consent=1; expires=" + dateString + "; path=/"; + + removeCookieConsentBanner(); +} + function checkConsentCookie() { // get the cookie let consentCookie = document.cookie; @@ -71,6 +86,10 @@ function checkConsentCookie() { } } +document.getElementById("cookie-consent-btn")?.addEventListener("click", () => { + createConsentCookie(); +}); + const inEu = Intl.DateTimeFormat().resolvedOptions().timeZone.startsWith("Europe"); if (inEu) { diff --git a/src/layouts/BlogArticle.astro b/src/layouts/BlogArticle.astro index 1410487..8223d6b 100644 --- a/src/layouts/BlogArticle.astro +++ b/src/layouts/BlogArticle.astro @@ -1,13 +1,39 @@ --- -import Blog from "./Blog.astro"; +import BlogHeader from "../components/BlogHeader.astro"; +import CookieConsent from "../components/CookieConsent.astro"; import BlogFooter from "../components/BlogFooter.astro"; +import "../css/global.css"; +import "../css/blog.css"; + const { title } = Astro.props; --- - -

{title}

- + + + + + + + + + + + + + Grathium Industries - {title ?? 'Blog'} + + + + + +

{title}

+ + + + - - + + +