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

refactor: render TrackingSDK as first child to pages

Browse Source 
This helps with debugging and profiling.

Also tracking isn't tied to the rendering of the UI. So nitpicking could also
justify this change :)
This commit is contained in:
Michael Zetterberg
2024-07-30 15:44:48 +02:00
parent 2c0116e67b
commit bbc8801d3f
4 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
View File

@@ -20,15 +20,19 @@ export default async function MyPages({
} }
const { tracking, accountPage } = accountPageRes const { tracking, accountPage } = accountPageRes
return ( return (
<main className={styles.blocks}> <>
<Title>{accountPage.heading}</Title> <main className={styles.blocks}>
{accountPage.content.length ? ( <Title>{accountPage.heading}</Title>
<Content lang={params.lang} content={accountPage.content} /> {accountPage.content.length ? (
) : ( <Content lang={params.lang} content={accountPage.content} />
<p>{formatMessage({ id: "No content published" })}</p> ) : (
)} <p>{formatMessage({ id: "No content published" })}</p>
)}
</main>
<TrackingSDK pageData={tracking} /> <TrackingSDK pageData={tracking} />
</main> </>
) )
} }

25
components/ContentType/LoyaltyPage/LoyaltyPage.tsx
View File

@@ -20,18 +20,21 @@ export default async function LoyaltyPage({ lang }: LangParams) {
const { tracking, loyaltyPage } = loyaltyPageRes const { tracking, loyaltyPage } = loyaltyPageRes
return ( return (
<section className={styles.content}> <>
{loyaltyPage.sidebar.length ? ( <section className={styles.content}>
<Sidebar blocks={loyaltyPage.sidebar} lang={lang} /> {loyaltyPage.sidebar.length ? (
) : null} <Sidebar blocks={loyaltyPage.sidebar} lang={lang} />
<MaxWidth className={styles.blocks} tag="main">
<Title>{loyaltyPage.heading}</Title>
{loyaltyPage.blocks ? (
<Blocks blocks={loyaltyPage.blocks} lang={lang} />
) : null} ) : null}
</MaxWidth>
<MaxWidth className={styles.blocks} tag="main">
<Title>{loyaltyPage.heading}</Title>
{loyaltyPage.blocks ? (
<Blocks blocks={loyaltyPage.blocks} lang={lang} />
) : null}
</MaxWidth>
</section>
<TrackingSDK pageData={tracking} /> <TrackingSDK pageData={tracking} />
</section> </>
) )
} }

11
components/ContentType/Webviews/AccountPage.tsx
View File

@@ -25,10 +25,13 @@ export default async function MyPages({ lang }: LangParams) {
const linkToOverview = `/${lang}/webview${accountPage.url}` !== overview[lang] const linkToOverview = `/${lang}/webview${accountPage.url}` !== overview[lang]
return ( return (
<MaxWidth className={styles.blocks} tag="main"> <>
{linkToOverview ? <LinkToOverview lang={lang} /> : null} <MaxWidth className={styles.blocks} tag="main">
<Content lang={lang} content={accountPage.content} /> {linkToOverview ? <LinkToOverview lang={lang} /> : null}
<Content lang={lang} content={accountPage.content} />
</MaxWidth>
<TrackingSDK pageData={tracking} /> <TrackingSDK pageData={tracking} />
</MaxWidth> </>
) )
} }

17
components/ContentType/Webviews/LoyaltyPage.tsx
View File

@@ -19,13 +19,16 @@ export default async function AboutScandicFriends({ lang }: LangParams) {
const { tracking, loyaltyPage } = loyaltyPageRes const { tracking, loyaltyPage } = loyaltyPageRes
return ( return (
<section className={styles.content}> <>
<LinkToOverview lang={lang} /> <section className={styles.content}>
<MaxWidth tag="main" className={styles.blocks}> <LinkToOverview lang={lang} />
<Title>{loyaltyPage.heading}</Title> <MaxWidth tag="main" className={styles.blocks}>
<Blocks blocks={loyaltyPage.blocks} lang={lang} /> <Title>{loyaltyPage.heading}</Title>
</MaxWidth> <Blocks blocks={loyaltyPage.blocks} lang={lang} />
</MaxWidth>
</section>
<TrackingSDK pageData={tracking} /> <TrackingSDK pageData={tracking} />
</section> </>
) )
} }