From dc105992c5991a289c6b9ebcc8a97ce2da25bcc2 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Mon, 27 Jan 2025 12:32:36 +0000 Subject: [PATCH] Merged in feat/sentry-errors-fixes (pull request #1216) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed VWO and cookie-bot * Removed VWO and cookie-bot * Merged master into feat/sentry-errors-fixes Approved-by: Joakim Jäderberg --- app/[lang]/(live)/layout.tsx | 3 - app/[lang]/(live-current)/layout.tsx | 7 - components/CookieBot/index.tsx | 3 +- components/Current/NewVWOScript.tsx | 317 --------------------------- components/Current/VwoScript.tsx | 136 ------------ public/_static/dist/js/vwo.js | 211 ------------------ public/_static/js/cookie-bot.js | 85 ------- 7 files changed, 1 insertion(+), 761 deletions(-) delete mode 100644 components/Current/NewVWOScript.tsx delete mode 100644 components/Current/VwoScript.tsx delete mode 100644 public/_static/dist/js/vwo.js delete mode 100644 public/_static/js/cookie-bot.js diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 7d0397a0b..d1edd6010 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -7,7 +7,6 @@ import TrpcProvider from "@/lib/trpc/Provider" import TokenRefresher from "@/components/Auth/TokenRefresher" import CookieBotConsent from "@/components/CookieBot" -import VwoScript from "@/components/Current/VwoScript" import StorageCleaner from "@/components/HotelReservation/EnterDetails/StorageCleaner" import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import { preloadUserTracking } from "@/components/TrackingSDK" @@ -44,7 +43,6 @@ export default async function RootLayout({ - - diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx index ef9477a87..c1333c0f9 100644 --- a/app/[lang]/(live-current)/layout.tsx +++ b/app/[lang]/(live-current)/layout.tsx @@ -41,7 +41,6 @@ export default async function RootLayout({ {/* eslint-disable-next-line @next/next/no-css-tags */} - - - - {/* */} - - ) -} diff --git a/components/Current/VwoScript.tsx b/components/Current/VwoScript.tsx deleted file mode 100644 index ead4f8a3f..000000000 --- a/components/Current/VwoScript.tsx +++ /dev/null @@ -1,136 +0,0 @@ -import Script from "next/script" - -export default function VwoScript() { - return ( - - ) -} diff --git a/public/_static/dist/js/vwo.js b/public/_static/dist/js/vwo.js deleted file mode 100644 index cb12b8d85..000000000 --- a/public/_static/dist/js/vwo.js +++ /dev/null @@ -1,211 +0,0 @@ -// The smart code script generated by VWO includes the instruction: -//"DO NOT make any changes to smart code except for entering your account id" -// -// HOWEVER, changes have been made in order to remove the unwanted blur filter/loader logic -// Example of said logic: https://help.vwo.com/hc/en-us/articles/4402914949401-Executing-VWO-SmartCode-on-Valid-Consent - -window._vwo_code || - (function () { - var account_id = 373511, - version = 2.0, - settings_tolerance = 2000, - hide_element = "body", - hide_element_style = - "opacity:0 !important;filter:alpha(opacity=0) !important;background:none !important", - /* DO NOT EDIT BELOW THIS LINE */ - f = false, - w = window, - d = document, - v = d.querySelector("#vwoCode"), - cK = "_vwo_" + account_id + "_settings", - cc = {}; - try { - var c = JSON.parse( - localStorage.getItem("_vwo_" + account_id + "_config") - ); - cc = c && typeof c === "object" ? c : {}; - } catch (e) {} - var stT = cc.stT === "session" ? w.sessionStorage : w.localStorage; - code = { - use_existing_jquery: function () { - return typeof use_existing_jquery !== "undefined" - ? use_existing_jquery - : undefined; - }, - library_tolerance: function () { - return typeof library_tolerance !== "undefined" - ? library_tolerance - : undefined; - }, - settings_tolerance: function () { - return cc.sT || settings_tolerance; - }, - hide_element_style: function () { - return "{" + (cc.hES || hide_element_style) + "}"; - }, - hide_element: function () { - return typeof cc.hE === "string" ? cc.hE : hide_element; - }, - getVersion: function () { - return version; - }, - finish: function () { - if (!f) { - f = true; - var a = d.getElementById("_vis_opt_path_hides"); - if (a) a.parentNode.removeChild(a); - } - }, - finished: function () { - return f; - }, - load: function (a) { - var s = this.getSettings(), - b = d.createElement("script"), - t = this; - if (s) { - b.textContent = s; - d.getElementsByTagName("head")[0].appendChild(b); - if (!w.VWO || VWO.caE) { - stT.removeItem(cK); - t.load(a); - } - } else { - b.fetchPriority = "high"; - b.src = a; - b.type = "text/javascript"; - b.onerror = function () { - window._vwo_code.finish(); - }; - d.getElementsByTagName("head")[0].appendChild(b); - } - }, - getSettings: function () { - try { - var i = stT.getItem(cK); - if (!i) { - return; - } - i = JSON.parse(i); - if (Date.now() > i.e) { - stT.removeItem(cK); - return; - } - return i.s; - } catch (e) { - return; - } - }, - - init: function () { - if (d.URL.indexOf("__vwo_disable__") > -1) return; - var sT = this.settings_tolerance(); - w._vwo_settings_timer = setTimeout(function () { - window._vwo_code.finish(); - stT.removeItem(cK); - }, sT); - var filterConfig = this.filterConfig; - if (!filterConfig || filterConfig.filterTime === "balanced") { - var cS = d.currentScript, - a = d.createElement("style"), - hE = this.hide_element(), - b = - cS && !cS.async && hE - ? hE + "{" + this.hide_element_style() + "}" - : "", - h = d.getElementsByTagName("head")[0]; - a.setAttribute("id", "_vis_opt_path_hides"); - v && a.setAttribute("nonce", v.nonce); - a.setAttribute("type", "text/css"); - if (a.styleSheet) a.styleSheet.cssText = b; - else a.appendChild(d.createTextNode(b)); - h.appendChild(a); - } - this.load( - "https://dev.visualwebsiteoptimizer.com/j.php?a=" + - account_id + - "&u=" + - encodeURIComponent(d.URL) + - "&vn=" + - version - ); - }, - setFilterConfigAndApplyFilter: function (config) { - if (!config) { - // No config will lead to early return and no addition of smart code - return; - } - var state = this.isNonLiveMode(account_id) || config.isConsentGiven(); - if (state === "1") { - // if cookie consent was already given and the cookies were already accepted, execute out normal flow - hide_element = "body"; - w._vwo_settings_timer = window._vwo_code.init(); - return; - } else if (state === "2") { - return; - } - - this.filterConfig = config; - - var timer = setInterval(function () { - var state = config.isConsentGiven(); - var shouldClearInterval; - if (state === "1") { - w._vwo_settings_timer = window._vwo_code.init(); - shouldClearInterval = true; - } else if (state === "2") { - window._vwo_code.filterConfig = undefined; - shouldClearInterval = true; - } - if (shouldClearInterval) { - clearInterval(timer); - } - }, 100); - }, - isNonLiveMode: function (accountId) { - var wName = w.name; - if (!wName) { - return; - } - return ( - (wName.indexOf("_vis_editor") > -1 || - wName.indexOf("_vis_preview_" + accountId) > -1 || - wName.indexOf("_vis_heatmap_" + accountId) > -1) && - "1" - ); - }, - }; - w._vwo_code = code; - })(); -window._vwo_code.setFilterConfigAndApplyFilter({ - popupSelector: "#CybotCookiebotDialog", - filterTime: "balanced", - isConsentGiven: function () { - /** your custom Code */ - if (document.cookie.indexOf("CookieConsent") != -1) { - var ccValue = - decodeURIComponent( - document.cookie.replace( - new RegExp( - "(?:(?:^|.*;)\\s*" + - encodeURIComponent("CookieConsent").replace( - /[\-\.\+\*]/g, - "\\$&" - ) + - "\\s*\\=\\s*([^;]*).*$)|^.*$" - ), - "$1" - ) - ) || null; - let consentValue = "2"; - if (ccValue) { - ccValue = ccValue.substring(ccValue.indexOf(",statistics") + 12); - ccValue = ccValue.substring(0, ccValue.indexOf(",")); - consentValue = ccValue === "true" ? "1" : "2"; - } - return consentValue; - } else { - return "3"; - } - }, -}); diff --git a/public/_static/js/cookie-bot.js b/public/_static/js/cookie-bot.js deleted file mode 100644 index f94d46e36..000000000 --- a/public/_static/js/cookie-bot.js +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Makes some brute force adjustments on the open cookiebot dialog and adds our own styling - */ -var fixCookieBotDialog = function() { - document.querySelector("head").insertAdjacentHTML("beforeend", ""); - var e = function(e) { - i = !!(e = !!e) || i; - var t = document.querySelector("#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection") - , o = document.querySelector("#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll"); - t.style.display = "none" != t.style.display || e ? "none" : "block", - o.style.display = "none" == o.style.display || e ? "block" : "none" - }; - document.querySelector("#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection").style.display = "none", - document.querySelector("#CybotCookiebotDialogBodyLevelDetailsWrapper").setAttribute("class", "custom-select"); - var t = document.querySelector("#CybotCookiebotDialogBody") - , o = document.querySelector("#CybotCookiebotDialogBodyLevelWrapper"); - t.insertBefore(document.querySelector("#CybotCookiebotDialogDetail"), o); - var n = document.querySelector("#CybotCookiebotDialogBodyLevelButtonsSelectPane"); - t.insertBefore(n, o), - n.style.display = "none", - window.innerWidth > 740 && window.dispatchEvent(new Event("resize")), - document.querySelector("#CybotCookiebotDialogBodyLevelDetailsWrapper").addEventListener("click", (function() { - n.style.display = "none" == n.style.display ? "block" : "none"; - var t = document.querySelector("#CybotCookiebotDialogBodyLevelDetailsWrapper").classList; - if (t.contains("active")) - t.remove("active"), - document.querySelector("#CybotCookiebotDialog").classList.remove("expanded"), - e(!0); - else { - t.add("active"), - document.querySelector("#CybotCookiebotDialog").classList.add("expanded"), - a(); - var o = document.querySelectorAll(".CybotCookiebotDialogDetailBodyContentCookieTypeTableContainer"); - if ("none" != o[0].parentElement.style.display) - for (var i = o[0].querySelector("table").clientWidth, l = 0; l < o.length; l++) - o[l].previousElementSibling.style.minWidth = i + "px", - o[l].style.minWidth = i + "px" - } - } - )); - for (var i = !0, l = document.querySelectorAll("#CybotCookiebotDialogBodyLevelButtonsSelectPane input[type=checkbox]"), a = function() { - for (var t = !0, o = 0; o < l.length; o++) - l[o].checked || (t = !1); - i != t && (i = t, - e()) - }, r = 0; r < l.length; r++) - l[r].addEventListener("change", a) - }; - -window.addEventListener("CookiebotOnDialogDisplay", fixCookieBotDialog); -// If the cookiebot dialog was opened before this file was run we run the fix function "manually" -if (document.querySelector("#CybotCookiebotDialog")) { - fixCookieBotDialog(); -} - -window.addEventListener("load", (function() { - var e = document.querySelector("#CookieDeclarationChangeConsent > a") - , t = document.querySelector("#CookieDeclarationChangeConsent > span > a"); - if (e) - switch (document.documentElement.lang) { - default: - e.text = "Change your consent", - t.text = "Withdraw your consent"; - break; - case "sv": - e.text = "Ändra mitt samtycke", - t.text = "Ångra mitt samtycke"; - break; - case "no": - e.text = "Trække dit samtykke tilbage", - t.text = "Trekk tilbake ditt samtykke"; - break; - case "da": - e.text = "Ændre dit samtykke", - t.text = "Trække dit samtykke tilbage"; - break; - case "de": - e.text = "Ihre Einwilligung ändern", - t.text = "Ihre Einwilligung zurückziehen"; - break; - case "fi": - e.text = "Muuta hyväksyntäsi", - t.text = "Peru hyväksyntäsi" - } -}));