Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs(PPDSC-2477): remove sourcepoint component #461

Merged
merged 15 commits into from
Mar 27, 2023
Merged

docs(PPDSC-2477): remove sourcepoint component #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c480bf4
docs(PPDSC-2477): remove sourcepoint component
Oct 24, 2022
f25b5ce
docs(PPDSC-2477): remvoe consent script
Nov 7, 2022
9ad55a6
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Nov 7, 2022
873fb42
docs(PPDSC-2477): merge
Nov 17, 2022
df5348b
docs(PPDSC-2477): merge
Nov 18, 2022
501d356
docs(PPDSC-2477): add prod env check
Nov 18, 2022
58f532f
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Jan 16, 2023
ba8079e
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Mar 13, 2023
6ff1d6d
docs(PPDSC-2477): update Tealium
Mar 13, 2023
6a5544f
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Mar 15, 2023
ca1a9a6
docs(PPDSC-2477): remove privacy policy link
Mar 16, 2023
2149c8f
docs(PPDSC-2477): remove sourcepoint
Mar 23, 2023
2f67bb5
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Mar 23, 2023
764d5a5
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Mar 24, 2023
43b60b8
Merge branch 'main' into docs/PPDSC-2477-consolidate-sourcepoint
mutebg Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .storybook/addons/tealium/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Helmet from 'react-helmet';
import {IconButton, Icons} from '@storybook/components';

import {
Consent,
Tealium,
ConsentSettingsLink,
newskitLightTheme,
Expand Down Expand Up @@ -55,11 +54,6 @@ const CONFIG = {
profileId: 'thetimes.storybook',
env: isProduction ? 'prod' : 'dev',
},
consent: {
accountId: 259,
propertyHref: 'https://newskit.co.uk',
gdpr: {},
},
};

const Tool = () => {
Expand All @@ -81,10 +75,6 @@ const Tool = () => {
{''}
</ConsentSettingsLink>
<Tealium {...CONFIG.tealium} reactHelmet={Helmet} />
<Consent
sourcePointConfigUnified={CONFIG.consent}
reactHelmet={Helmet}
/>
<Tooltip content="Privacy Manager" asLabel placement="left">
<span>
<IconButton
Expand Down
9 changes: 4 additions & 5 deletions site/components/site-footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import {
Grid,
Cell,
ConsentSettingsLink,
getColorCssFromTheme,
getSizingCssFromTheme,
getMediaQueryFromTheme,
Expand Down Expand Up @@ -96,14 +95,14 @@ const SiteFooter: React.FC<FooterProps> = ({cellProps = {xs: 12}}) => (
</Link>
</FooterLink>
<FooterLink>
<ConsentSettingsLink
privacyManagerId="407619"
gdpr
<Link
type="standalone"
href="/"
overrides={linkOverrides}
eventContext={{value: 'Privacy policy'}}
>
Privacy policy
</ConsentSettingsLink>
</Link>
</FooterLink>
<FooterLink>
<Link
Expand Down
15 changes: 2 additions & 13 deletions site/pages/_document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Document, {Head, Main, NextScript, Html} from 'next/document';
import {
Global,
css,
Consent,
Tealium,
compileTheme,
newskitLightTheme,
Expand All @@ -22,30 +21,19 @@ const baseHref =

const Base = () => <base href={baseHref} />;

const compiledNewskitLightTheme = compileTheme(newskitLightTheme);
export default class MyDocument extends Document {
render() {
const isSiteEnvProduction = process.env.SITE_ENV === 'production';

const helmet = Helmet.rewind();

const compiledNewskitLightTheme = compileTheme(newskitLightTheme);

return (
<Html lang="en">
<Head>
<Base />
{helmet.script.toComponent()}
<HTMLMeta />
{isSiteEnvProduction && (
<Consent
sourcePointConfigUnified={{
accountId: 259,
propertyHref: 'https://newskit.co.uk',
gdpr: {},
}}
reactHelmet={Helmet}
/>
)}
</Head>
<body>
<Global
Expand Down Expand Up @@ -278,6 +266,7 @@ export default class MyDocument extends Document {
reactHelmet={Helmet}
/>
)}

<Main />
<NextScript />
</body>
Expand Down
77 changes: 42 additions & 35 deletions site/pages/help/terms-and-conditions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,44 +39,51 @@ const Introduction = ({path, ...props}: LayoutProps) => (
name="Website terms and conditions of use"
introduction={
<>
<P overrides={contentOverrides}>
Welcome to the Website Terms and Conditions of Use (<b>Terms</b>)
which apply to{' '}
<Link href="https://newskit.co.uk/" target="_blank">
https://newskit.co.uk/
</Link>{' '}
(the <b>Website</b>).
<br />
<br />
By using our Website you agree to be legally bound by these Terms.
If you do not agree to these Terms, you should not use our Website.
<br />
<br />
On this Website, we make available various software components,
features and tools (<b>Components</b>), including code which has
been developed by or on behalf of News UK to form the basis of
NewsKit (<b>NewsKit OSS</b>).
<br />
<br />
Separate terms may apply to your usage of NewsKit OSS and other
Components, including these{' '}
<Link
href="https://github.com/newscorp-ghfb/newskit/blob/main/LICENSE"
target="_blank"
>
Open Source Terms
</Link>
. You should ensure that you check, and comply with, the terms of
the licences for any such Components before using them.
<br />
<br />
In the event of a conflict between these Terms and the Open Source
Terms in any way, the Open Source Terms shall prevail in relation to
your usage of any Components (including NewsKit OSS).
</P>
Welcome to the Website Terms and Conditions of Use (<b>Terms</b>)
which apply to{' '}
<Link href="https://newskit.co.uk/" target="_blank">
https://newskit.co.uk/
</Link>{' '}
(the <b>Website</b>).
</>
}
/>
<ComponentPageCell>
<ContentSection>
<ContentSecondary
description={
<>
By using our Website you agree to be legally bound by these Terms.
If you do not agree to these Terms, you should not use our
Website.
<br />
<br />
On this Website, we make available various software components,
features and tools (<b>Components</b>), including code which has
been developed by or on behalf of News UK to form the basis of
NewsKit (<b>NewsKit OSS</b>).
<br />
<br />
Separate terms may apply to your usage of NewsKit OSS and other
Components, including these{' '}
<Link
href="https://github.com/newscorp-ghfb/newskit/blob/main/LICENSE"
target="_blank"
>
Open Source Terms
</Link>
. You should ensure that you check, and comply with, the terms of
the licences for any such Components before using them.
<br />
<br />
In the event of a conflict between these Terms and the Open Source
Terms in any way, the Open Source Terms shall prevail in relation
to your usage of any Components (including NewsKit OSS).
</>
}
/>
</ContentSection>
</ComponentPageCell>

<ComponentPageCell>
<ContentSection sectionName="accessing and using our website">
Expand Down