From 01db12a9877b265a371812be76617fce041cc97b Mon Sep 17 00:00:00 2001 From: Jon McClure Date: Wed, 28 Feb 2024 18:21:49 +0000 Subject: [PATCH] removes sharer component and cleans up ads --- src/components/AdSlot/AdScripts.svelte | 6 +- src/components/AdSlot/AdSlot.stories.svelte | 6 +- .../AdSlot/stories/docs/component.md | 37 +++-- src/components/Sharer/Sharer.stories.svelte | 22 --- src/components/Sharer/Sharer.svelte | 152 ------------------ .../Sharer/stories/docs/component.md | 9 -- .../Sharer/utils/copyToClipboard.js | 10 -- src/components/Sharer/utils/facebook.js | 22 --- src/components/Sharer/utils/meta.js | 7 - src/components/Sharer/utils/twitter.js | 22 --- src/index.js | 1 - 11 files changed, 22 insertions(+), 272 deletions(-) delete mode 100644 src/components/Sharer/Sharer.stories.svelte delete mode 100644 src/components/Sharer/Sharer.svelte delete mode 100644 src/components/Sharer/stories/docs/component.md delete mode 100644 src/components/Sharer/utils/copyToClipboard.js delete mode 100644 src/components/Sharer/utils/facebook.js delete mode 100644 src/components/Sharer/utils/meta.js delete mode 100644 src/components/Sharer/utils/twitter.js diff --git a/src/components/AdSlot/AdScripts.svelte b/src/components/AdSlot/AdScripts.svelte index 5b46ddb5..1e8111f6 100644 --- a/src/components/AdSlot/AdScripts.svelte +++ b/src/components/AdSlot/AdScripts.svelte @@ -5,14 +5,16 @@ import { throttle } from 'lodash-es'; let lastScroll = 0; - let showManagePreferences = false; + let showManagePreferences = true; const togglePrefs = (on = true) => { const btn = document.getElementById('ot-sdk-btn-floating'); if (!btn) return; if (on) { + showManagePreferences = true; btn.style.bottom = ''; } else { + showManagePreferences = false; btn.style.bottom = '-5rem'; } }; @@ -20,12 +22,10 @@ const handleScroll = () => { if (lastScroll > window.scrollY) { if (!showManagePreferences) { - showManagePreferences = true; togglePrefs(true); } } else { if (showManagePreferences && window.scrollY > 250) { - showManagePreferences = false; togglePrefs(false); } } diff --git a/src/components/AdSlot/AdSlot.stories.svelte b/src/components/AdSlot/AdSlot.stories.svelte index 7d8adf20..6e9edf18 100644 --- a/src/components/AdSlot/AdSlot.stories.svelte +++ b/src/components/AdSlot/AdSlot.stories.svelte @@ -17,11 +17,7 @@ argTypes: { placementName: { control: 'select', - options: [ - 'reuters_desktop_leaderboard_atf', - 'reuters_desktop_native', - 'reuters_desktop_canvas', - ], + options: ['reuters_desktop_native_1', 'reuters_desktop_canvas'], }, dataFreestarAd: { control: 'select', diff --git a/src/components/AdSlot/stories/docs/component.md b/src/components/AdSlot/stories/docs/component.md index b5858460..4be666d0 100644 --- a/src/components/AdSlot/stories/docs/component.md +++ b/src/components/AdSlot/stories/docs/component.md @@ -1,29 +1,28 @@ -Display a FreeStar Ad Slot +Add programmatic ads to your page. -Note: You must use this domain to access the story book: -`http://localhost.arcpublishing.com:3000` - -This domain has been whitelisted on the Ad server. To setup the domain locally, add the following line to `/etc/hosts`: - -``` -127.0.0.1 localhost localhost.arcpublishing.com -``` +> **IMPORTANT!** Make sure ads are only used on dotcom pages, never on embeds. ```svelte - - + +{#if !embedded} + + +{/if} - + - +{#if !embedded} + +{/if} + + + +{#if !embedded} + + +{/if} ``` diff --git a/src/components/Sharer/Sharer.stories.svelte b/src/components/Sharer/Sharer.stories.svelte deleted file mode 100644 index 97ac14e2..00000000 --- a/src/components/Sharer/Sharer.stories.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - diff --git a/src/components/Sharer/Sharer.svelte b/src/components/Sharer/Sharer.svelte deleted file mode 100644 index 7dcc9a0e..00000000 --- a/src/components/Sharer/Sharer.svelte +++ /dev/null @@ -1,152 +0,0 @@ - - -
-
- - - -
-
- - diff --git a/src/components/Sharer/stories/docs/component.md b/src/components/Sharer/stories/docs/component.md deleted file mode 100644 index 194cedc8..00000000 --- a/src/components/Sharer/stories/docs/component.md +++ /dev/null @@ -1,9 +0,0 @@ -Add share tools to a page. - -```svelte - - - -``` diff --git a/src/components/Sharer/utils/copyToClipboard.js b/src/components/Sharer/utils/copyToClipboard.js deleted file mode 100644 index 21d1470f..00000000 --- a/src/components/Sharer/utils/copyToClipboard.js +++ /dev/null @@ -1,10 +0,0 @@ -const copyToClipboard = (str) => { - const el = document.createElement('textarea'); - el.value = str; - document.body.appendChild(el); - el.select(); - document.execCommand('copy'); - document.body.removeChild(el); -}; - -export default copyToClipboard; diff --git a/src/components/Sharer/utils/facebook.js b/src/components/Sharer/utils/facebook.js deleted file mode 100644 index c1e1d3c8..00000000 --- a/src/components/Sharer/utils/facebook.js +++ /dev/null @@ -1,22 +0,0 @@ -import { getHref } from './meta'; - -const handlePost = () => { - const windowOptions = 'scrollbars=yes,resizable=yes,toolbar=no,location=yes'; - const width = 550; - const height = 420; - const winHeight = screen.height; - const winWidth = screen.width; - - const left = Math.round(winWidth / 2 - width / 2); - const top = winHeight > height ? Math.round(winHeight / 2 - height / 2) : 0; - - const target = `https://www.facebook.com/sharer/sharer.php?u=${getHref()}`; - - window.open( - target, - 'intent', - `${windowOptions},width=${width},height=${height},left=${left},top=${top}` - ); -}; - -export default handlePost; diff --git a/src/components/Sharer/utils/meta.js b/src/components/Sharer/utils/meta.js deleted file mode 100644 index 7473523f..00000000 --- a/src/components/Sharer/utils/meta.js +++ /dev/null @@ -1,7 +0,0 @@ -export const getTitle = () => { - const ogTag = document.querySelector("meta[property='og:title']"); - if (ogTag) return encodeURIComponent(ogTag.getAttribute('content')); - return encodeURIComponent(document.title); -}; - -export const getHref = () => encodeURIComponent(window.location.href); diff --git a/src/components/Sharer/utils/twitter.js b/src/components/Sharer/utils/twitter.js deleted file mode 100644 index 129959da..00000000 --- a/src/components/Sharer/utils/twitter.js +++ /dev/null @@ -1,22 +0,0 @@ -import { getHref, getTitle } from './meta'; - -const handleTweet = () => { - const windowOptions = 'scrollbars=yes,resizable=yes,toolbar=no,location=yes'; - const width = 550; - const height = 420; - const winHeight = screen.height; - const winWidth = screen.width; - - const left = Math.round(winWidth / 2 - width / 2); - const top = winHeight > height ? Math.round(winHeight / 2 - height / 2) : 0; - - const target = `https://twitter.com/intent/tweet?text=${getTitle()}&via=Reuters&url=${getHref()}`; - - window.open( - target, - 'intent', - `${windowOptions},width=${width},height=${height},left=${left},top=${top}` - ); -}; - -export default handleTweet; diff --git a/src/index.js b/src/index.js index e1d8de41..61ab62f9 100644 --- a/src/index.js +++ b/src/index.js @@ -35,7 +35,6 @@ export { default as ReutersLogo } from './components/ReutersLogo/ReutersLogo.sve export { default as Scroller } from './components/Scroller/Scroller.svelte'; export { default as SearchInput } from './components/SearchInput/SearchInput.svelte'; export { default as SEO } from './components/SEO/SEO.svelte'; -export { default as Sharer } from './components/Sharer/Sharer.svelte'; export { default as SimpleTimeline } from './components/SimpleTimeline/SimpleTimeline.svelte'; export { default as SiteFooter } from './components/SiteFooter/SiteFooter.svelte'; export { default as SiteHeader } from './components/SiteHeader/SiteHeader.svelte';