scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Linus Flood
2024-11-13 09:59:41 +01:00
parent 495e628d39
commit 0a3b063219
5 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/[lang]/(live)/layout.tsx
View File

@@ -61,13 +61,12 @@ export default async function RootLayout({
<body> <body>
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}> <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
<TrpcProvider> <TrpcProvider>
<RouterTracking> <RouterTracking />
{!env.HIDE_FOR_NEXT_RELEASE && <>{sitewidealert}</>} {!env.HIDE_FOR_NEXT_RELEASE && <>{sitewidealert}</>}
{header} {header}
{!env.HIDE_FOR_NEXT_RELEASE && <>{bookingwidget}</>} {!env.HIDE_FOR_NEXT_RELEASE && <>{bookingwidget}</>}
{children} {children}
{footer} {footer}
</RouterTracking>
<ToastHandler /> <ToastHandler />
<TokenRefresher /> <TokenRefresher />
<CookieBotConsent /> <CookieBotConsent />

3
app/[lang]/(live-current)/layout.tsx
View File

@@ -66,14 +66,13 @@ export default async function RootLayout({
<LangPopup /> <LangPopup />
<SkipToMainContent /> <SkipToMainContent />
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}> <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
<RouterTracking> <RouterTracking />
{header} {header}
<BookingWidget /> <BookingWidget />
{children} {children}
<Footer /> <Footer />
<TokenRefresher /> <TokenRefresher />
<CookieBotConsent /> <CookieBotConsent />
</RouterTracking>
</ServerIntlProvider> </ServerIntlProvider>
<Script id="page-tracking">{` <Script id="page-tracking">{`
typeof _satellite !== "undefined" && _satellite.pageBottom(); typeof _satellite !== "undefined" && _satellite.pageBottom();

3
app/[lang]/webview/layout.tsx
View File

@@ -41,7 +41,8 @@ export default async function RootLayout({
<body className={styles.layout}> <body className={styles.layout}>
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}> <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
<TrpcProvider> <TrpcProvider>
<RouterTracking>{children}</RouterTracking> <RouterTracking />
{children}
</TrpcProvider> </TrpcProvider>
</ServerIntlProvider> </ServerIntlProvider>
</body> </body>

1
components/TrackingSDK/RouterTracking.tsx
View File

@@ -17,6 +17,7 @@ export default function RouterTracking({ children }: React.PropsWithChildren) {
useEffect(() => { useEffect(() => {
if (hasRun) { if (hasRun) {
console.log("TRACKING: RESET PAGE LOAD TIME")
setInitialPageLoadTime(Date.now()) setInitialPageLoadTime(Date.now())
trackPageViewStart() trackPageViewStart()
startTransition(() => { startTransition(() => {

14
components/TrackingSDK/RouterTransition.tsx
View File

@@ -37,11 +37,10 @@ export default function RouterTransition({
const pathName = usePathname() const pathName = usePathname()
const { isTransitioning, stopRouterTransition } = useRouterTransitionStore() const { isTransitioning, stopRouterTransition } = useRouterTransitionStore()
//const hasRunInitial = useRef<boolean>(false)
const hasRunInitial = useRef<boolean>(false)
useEffect(() => { useEffect(() => {
if (!hasRun && !hasRunInitial.current) { if (!hasRun) {
const perfObserver = new PerformanceObserver((observedEntries) => { const perfObserver = new PerformanceObserver((observedEntries) => {
const entry = observedEntries.getEntriesByType("navigation")[0] const entry = observedEntries.getEntriesByType("navigation")[0]
if (entry) { if (entry) {
@@ -51,9 +50,9 @@ export default function RouterTransition({
pageLoadTime: entry.duration / 1000, pageLoadTime: entry.duration / 1000,
} }
const pageObject = createSDKPageObject(trackingData) const pageObject = createSDKPageObject(trackingData)
// console.log("TRACKING: Tracking initial pageView", pageObject) console.log("TRACKING: Tracking initial pageView", pageObject)
// console.log("TRACKING: Tracking initial userData", userData) console.log("TRACKING: Tracking initial userData", userData)
// console.log("TRACKING: Tracking initial hotelInfo", hotelInfo) console.log("TRACKING: Tracking initial hotelInfo", hotelInfo)
window.adobeDataLayer.push({ window.adobeDataLayer.push({
event: "pageView", event: "pageView",
pageInfo: pageObject, pageInfo: pageObject,
@@ -68,7 +67,6 @@ export default function RouterTransition({
type: "navigation", type: "navigation",
buffered: true, buffered: true,
}) })
hasRunInitial.current = true
setHasRun() setHasRun()
} }
}, [pathName, hasRun, setHasRun, hotelInfo, userData, pageData]) }, [pathName, hasRun, setHasRun, hotelInfo, userData, pageData])
@@ -91,7 +89,7 @@ export default function RouterTransition({
!isTransitioning && !isTransitioning &&
status === TransitionStatusEnum.Done status === TransitionStatusEnum.Done
) { ) {
if (window.adobeDataLayer && hasRun && !hasRunInitial.current) { if (window.adobeDataLayer && hasRun) {
const trackingData = { const trackingData = {
...pageData, ...pageData,
pathName, pathName,