feat: 移除網站上的廣告 (#1037)

* feat: remove all ads on website * fix: style of experience detail * fix: remove unused elements & packages
goodjoblife · Dec 14, 2022 · f47f63f · f47f63f
1 parent facab47
commit f47f63f
Show file tree

Hide file tree

Showing 13 changed files with 11,698 additions and 11,687 deletions.
diff --git a/package.json b/package.json
@@ -84,7 +84,6 @@
     "razzle": "^2.4.0",
     "react": "^16.12.0",
     "react-autocomplete": "^1.8.1",
-    "react-dfp": "^0.17.2",
     "react-dom": "^16.12.0",
     "react-facebook-pixel": "^0.1.0",
     "react-ga": "^2.2.0",

diff --git a/public/ads.txt b/public/ads.txt
diff --git a/src/components/CompanyAndJobTitle/CompanyAndJobTitleWrapper.js b/src/components/CompanyAndJobTitle/CompanyAndJobTitleWrapper.js
@@ -4,7 +4,6 @@ import { toPairs, compose, map } from 'ramda';
 
 import Heading from 'common/base/Heading';
 import FanPageBlock from 'common/FanPageBlock';
-import GoogleAdsense from 'common/GoogleAdsense';
 import BreadCrumb from 'common/BreadCrumb';
 
 import {
@@ -55,11 +54,6 @@ const CompanyAndJobTitleWrapper = ({
       />
       {children}
       <FanPageBlock className={styles.fanPageBlock} />
-      <GoogleAdsense
-        className={styles.adBeforeFanPageBlock}
-        slot="2116582901"
-        responsive="true"
-      />
     </div>
   );
 };

diff --git a/src/components/CompanyAndJobTitle/Overview/Overview.js b/src/components/CompanyAndJobTitle/Overview/Overview.js
@@ -1,20 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useWindowSize } from 'react-use';
 
 import { Section } from 'common/base';
-import GoogleAdUnit from 'common/GoogleAdUnit';
 
 import SnippetBlock from './SnippetBlock';
 import WorkingHourTable from '../TimeAndSalary/WorkingHourTable';
 import WorkExperienceEntry from '../WorkExperiences/ExperienceEntry';
 import InterviewExperienceEntry from '../InterviewExperiences/ExperienceEntry';
 import { tabType as TAB_TYPE } from '../../../constants/companyJobTitle';
-import breakpoints from '../../../constants/breakpoints';
 import SummaryBlock from './SummaryBlock';
 
-import styles from './Overview.module.css';
-
 const SALARY_WORK_TIMES_LIMIT = 5;
 const WORK_EXPERIENCES_LIMIT = 3;
 const INTERVIEW_EXPERIENCES_LIMIT = 3;
@@ -32,7 +27,6 @@ const Overview = ({
   overtimeFrequencyCount,
   canView,
 }) => {
-  const { width } = useWindowSize();
   return (
     <Section Tag="main" paddingBottom>
       <SnippetBlock
@@ -50,14 +44,6 @@ const Overview = ({
           averageWeekWorkTime={averageWeekWorkTime}
           overtimeFrequencyCount={overtimeFrequencyCount}
         />
-        {width <= breakpoints.xs ? (
-          <div className={styles.adContainer}>
-            <GoogleAdUnit
-              sizes={[[300, 250]]}
-              adUnit="goodjob_m_list_above_300x250"
-            />
-          </div>
-        ) : null}
         <WorkingHourTable
           data={salaryWorkTimes.slice(0, SALARY_WORK_TIMES_LIMIT)}
           hideContent={!canView}

diff --git a/src/components/CompanyAndJobTitle/Overview/Overview.module.css b/src/components/CompanyAndJobTitle/Overview/Overview.module.css
@@ -24,10 +24,3 @@
     margin-top: 60px;
   }
 }
-
-.adContainer {
-  margin-top: -10px;
-  margin-bottom: 10px;
-  display: flex;
-  justify-content: center;
-}
diff --git a/src/components/CompanyAndJobTitle/index.js b/src/components/CompanyAndJobTitle/index.js
@@ -1,18 +1,11 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { Switch } from 'react-router';
-import { useWindowSize } from 'react-use';
 import Wrapper from 'common/base/Wrapper';
-import GoogleAdUnit, { Manager as GoogleAdManager } from 'common/GoogleAdUnit';
 import RouteWithSubRoutes from '../route';
 import styles from './styles.module.css';
-import breakpoints from '../../constants/breakpoints';
 
-const CompanyAndJobTitlePageContainer = ({ routes, location }) => {
-  const { width } = useWindowSize();
-  useEffect(() => {
-    GoogleAdManager.reload();
-  }, [location.pathname, location.search]);
+const CompanyAndJobTitlePageContainer = ({ routes }) => {
   return (
     <div>
       <Wrapper size="l" className={styles.container}>
@@ -23,14 +16,6 @@ const CompanyAndJobTitlePageContainer = ({ routes, location }) => {
             ))}
           </Switch>
         </div>
-        {width > breakpoints.md ? (
-          <div className={styles.sideAds}>
-            <GoogleAdUnit
-              sizes={[[160, 600]]}
-              adUnit="goodjob_pc_list_sidebar"
-            />
-          </div>
-        ) : null}
       </Wrapper>
     </div>
   );

diff --git a/src/components/ExperienceDetail/ExperienceDetail.module.css b/src/components/ExperienceDetail/ExperienceDetail.module.css
@@ -1,17 +1,5 @@
 @value below-small, above-small from "common/variables.module.css";
 
-.container {
-  display: flex;
-  justify-content: center;
-}
-
-.leftContainer {
-  flex-shrink: 1;
-  @media (min-width: above-small) {
-    padding-right: 16px;
-  }
-}
-
 .breadCrumb {
   margin-bottom: 16px;