From 9e7d47412acde37bd1c49a94a6a2496bc62d6086 Mon Sep 17 00:00:00 2001 From: Marc-Aurele Besner <82244926+marc-aurele-besner@users.noreply.github.com> Date: Sat, 23 Sep 2023 10:05:17 -0400 Subject: [PATCH 1/3] remove ads --- ui/shared/ad/AdBanner.tsx | 42 ++------------- ui/shared/ad/AdbutlerBanner.tsx | 55 ++------------------ ui/shared/ad/CoinzillaBanner.tsx | 27 ++-------- ui/shared/ad/CoinzillaTextAd.tsx | 88 ++------------------------------ ui/shared/ad/SliseBanner.tsx | 27 ++-------- ui/shared/ad/TextAd.tsx | 16 +----- ui/shared/ad/adbutlerScript.ts | 29 ----------- 7 files changed, 17 insertions(+), 267 deletions(-) delete mode 100644 ui/shared/ad/adbutlerScript.ts diff --git a/ui/shared/ad/AdBanner.tsx b/ui/shared/ad/AdBanner.tsx index dd948cdb77..15e833231f 100644 --- a/ui/shared/ad/AdBanner.tsx +++ b/ui/shared/ad/AdBanner.tsx @@ -1,45 +1,9 @@ -import { chakra, Skeleton } from '@chakra-ui/react'; -import React from 'react'; - -import config from 'configs/app'; -import { useAppContext } from 'lib/contexts/app'; -import * as cookies from 'lib/cookies'; - -import AdbutlerBanner from './AdbutlerBanner'; -import CoinzillaBanner from './CoinzillaBanner'; -import SliseBanner from './SliseBanner'; - -const feature = config.features.adsBanner; +import { chakra } from '@chakra-ui/react'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars const AdBanner = ({ className, isLoading }: { className?: string; isLoading?: boolean }) => { - const hasAdblockCookie = cookies.get(cookies.NAMES.ADBLOCK_DETECTED, useAppContext().cookies); - - if (!feature.isEnabled || hasAdblockCookie) { - return null; - } - - const content = (() => { - switch (feature.provider) { - case 'adbutler': - return ; - case 'coinzilla': - return ; - case 'slise': - return ; - } - })(); - return ( - - { content } - - ); + return null; }; export default chakra(AdBanner); diff --git a/ui/shared/ad/AdbutlerBanner.tsx b/ui/shared/ad/AdbutlerBanner.tsx index 88df6961e8..e2a4081260 100644 --- a/ui/shared/ad/AdbutlerBanner.tsx +++ b/ui/shared/ad/AdbutlerBanner.tsx @@ -1,57 +1,8 @@ -import { Flex, chakra } from '@chakra-ui/react'; -import { useRouter } from 'next/navigation'; -import Script from 'next/script'; -import React from 'react'; - -import config from 'configs/app'; -import useIsMobile from 'lib/hooks/useIsMobile'; -import isBrowser from 'lib/isBrowser'; -import { connectAdbutler, placeAd, ADBUTLER_ACCOUNT } from 'ui/shared/ad/adbutlerScript'; - -const feature = config.features.adsBanner; +import { chakra } from '@chakra-ui/react'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars const AdbutlerBanner = ({ className }: { className?: string }) => { - const router = useRouter(); - const isMobile = useIsMobile(); - React.useEffect(() => { - if (!feature.isEnabled || feature.provider !== 'adbutler') { - return; - } - - if (isBrowser() && window.AdButler) { - const abkw = window.abkw || ''; - if (!window.AdButler.ads) { - window.AdButler.ads = []; - } - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore: - let plc = window[`plc${ feature.adButler.config.mobile.id }`] || 0; - const adButlerConfig = isMobile ? feature.adButler.config.mobile : feature.adButler.config.desktop; - const banner = document.getElementById('ad-banner'); - if (banner) { - banner.innerHTML = '<' + 'div id="placement_' + adButlerConfig?.id + '_' + plc + '">'; - } - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore: - window.AdButler.ads.push({ handler: function(opt) { - window.AdButler.register( - ADBUTLER_ACCOUNT, - adButlerConfig.id, - [ adButlerConfig.width, adButlerConfig.height ], - `placement_${ adButlerConfig.id }_` + opt.place, - opt, - ); - }, opt: { place: plc++, keywords: abkw, domain: 'servedbyadbutler.com', click: 'CLICK_MACRO_PLACEHOLDER' } }); - } - }, [ router, isMobile ]); - - return ( - - - -
-
- ); + return null; }; export default chakra(AdbutlerBanner); diff --git a/ui/shared/ad/CoinzillaBanner.tsx b/ui/shared/ad/CoinzillaBanner.tsx index 2d979bf699..efd945bbfd 100644 --- a/ui/shared/ad/CoinzillaBanner.tsx +++ b/ui/shared/ad/CoinzillaBanner.tsx @@ -1,30 +1,9 @@ -import { Flex, chakra } from '@chakra-ui/react'; -import Script from 'next/script'; -import React from 'react'; - -import isBrowser from 'lib/isBrowser'; +import { chakra } from '@chakra-ui/react'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars const CoinzillaBanner = ({ className }: { className?: string }) => { - const isInBrowser = isBrowser(); - - React.useEffect(() => { - if (isInBrowser) { - window.coinzilla_display = window.coinzilla_display || []; - const cDisplayPreferences = { - zone: '26660bf627543e46851', - width: '728', - height: '90', - }; - window.coinzilla_display.push(cDisplayPreferences); - } - }, [ isInBrowser ]); - return ( - -