Merge pull request COVID19Tracking#1185 from COVID19Tracking/feature/…

…redirect-content-audit [⚠️WIP] Redirects & update page paths
HaydnCCI · Jul 6, 2020 · 53a3cab · 53a3cab
2 parents 7c605e4 + 786fd6c
commit 53a3cab
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 54 deletions.
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -85,6 +85,12 @@ exports.createPages = async ({ graphql, actions }) => {
           }
         }
       }
+      allContentfulRedirect {
+        nodes {
+          from
+          redirectTo
+        }
+      }
     }
   `)
 
@@ -124,6 +130,13 @@ exports.createPages = async ({ graphql, actions }) => {
     })
   })
 
+  result.data.allContentfulRedirect.nodes.forEach(({ from, redirectTo }) => {
+    createRedirect({
+      fromPath: from,
+      toPath: redirectTo,
+    })
+  })
+
   result.data.allContentfulChart.nodes.forEach(node => {
     createPage({
       path: `/data/charts/${node.slug}`,

diff --git a/src/__tests__/build/index.js b/src/__tests__/build/index.js
@@ -12,7 +12,7 @@ describe('Website build', () => {
   })
 
   it('has an API page', () => {
-    const exists = fs.pathExistsSync('./public/api/index.html')
+    const exists = fs.pathExistsSync('./public/data/api/index.html')
     expect(exists).toBe(true)
   })
 })
diff --git a/src/__tests__/components/layout/__snapshots__/footer.js.snap b/src/__tests__/components/layout/__snapshots__/footer.js.snap
@@ -42,7 +42,7 @@ exports[`Components : Layout : Footer renders correctly 1`] = `
           </li>
           <li>
             <a
-              href="/license"
+              href="/about-data/license"
             >
               License
             </a>
@@ -56,7 +56,7 @@ exports[`Components : Layout : Footer renders correctly 1`] = `
           </li>
           <li>
             <a
-              href="/accessibility"
+              href="/about/accessibility"
             >
               Accessibility
             </a>

diff --git a/src/__tests__/components/layout/__snapshots__/header.js.snap b/src/__tests__/components/layout/__snapshots__/header.js.snap
@@ -207,7 +207,7 @@ exports[`Components : Layout : Header renders correctly 1`] = `
         </nav>
         <a
           className="getInvolved"
-          href="/about-project/help"
+          href="/contact/volunteer"
         >
           Get Involved
         </a>
@@ -239,6 +239,7 @@ exports[`Components : Layout : Header renders correctly 1`] = `
          
         <a
           href="/race"
+          onClick={[Function]}
         >
           We just launched the COVID Racial Data Tracker
         </a>
@@ -460,7 +461,7 @@ exports[`Components : Layout : Header renders correctly 1`] = `
           </div>
           <a
             className="getInvolved"
-            href="/get-involved"
+            href="/contact/volunteer"
           >
             Get involved
           </a>
@@ -712,7 +713,7 @@ exports[`Components : Layout : Header renders correctly 2`] = `
         </nav>
         <a
           className="getInvolved"
-          href="/about-project/help"
+          href="/contact/volunteer"
         >
           Get Involved
         </a>
@@ -744,6 +745,7 @@ exports[`Components : Layout : Header renders correctly 2`] = `
          
         <a
           href="/race"
+          onClick={[Function]}
         >
           We just launched the COVID Racial Data Tracker
         </a>
@@ -965,7 +967,7 @@ exports[`Components : Layout : Header renders correctly 2`] = `
           </div>
           <a
             className="getInvolved"
-            href="/get-involved"
+            href="/contact/volunteer"
           >
             Get involved
           </a>
@@ -1217,7 +1219,7 @@ exports[`Components : Layout : Header renders correctly 3`] = `
         </nav>
         <a
           className="getInvolved"
-          href="/about-project/help"
+          href="/contact/volunteer"
         >
           Get Involved
         </a>
@@ -1249,6 +1251,7 @@ exports[`Components : Layout : Header renders correctly 3`] = `
          
         <a
           href="/race"
+          onClick={[Function]}
         >
           We just launched the COVID Racial Data Tracker
         </a>
@@ -1470,7 +1473,7 @@ exports[`Components : Layout : Header renders correctly 3`] = `
           </div>
           <a
             className="getInvolved"
-            href="/get-involved"
+            href="/contact/volunteer"
           >
             Get involved
           </a>
@@ -1726,7 +1729,7 @@ exports[`Components : Layout : Header renders correctly 4`] = `
         </nav>
         <a
           className="getInvolved"
-          href="/about-project/help"
+          href="/contact/volunteer"
         >
           Get Involved
         </a>
@@ -1758,6 +1761,7 @@ exports[`Components : Layout : Header renders correctly 4`] = `
          
         <a
           href="/race"
+          onClick={[Function]}
         >
           We just launched the COVID Racial Data Tracker
         </a>
@@ -1979,7 +1983,7 @@ exports[`Components : Layout : Header renders correctly 4`] = `
           </div>
           <a
             className="getInvolved"
-            href="/get-involved"
+            href="/contact/volunteer"
           >
             Get involved
           </a>
@@ -2231,7 +2235,7 @@ exports[`Components : Layout : Header renders correctly 5`] = `
         </nav>
         <a
           className="getInvolved"
-          href="/about-project/help"
+          href="/contact/volunteer"
         >
           Get Involved
         </a>
@@ -2263,6 +2267,7 @@ exports[`Components : Layout : Header renders correctly 5`] = `
          
         <a
           href="/race"
+          onClick={[Function]}
         >
           We just launched the COVID Racial Data Tracker
         </a>
@@ -2484,7 +2489,7 @@ exports[`Components : Layout : Header renders correctly 5`] = `
           </div>
           <a
             className="getInvolved"
-            href="/get-involved"
+            href="/contact/volunteer"
           >
             Get involved
           </a>

diff --git a/src/__tests__/components/layout/__snapshots__/index.js.snap b/src/__tests__/components/layout/__snapshots__/index.js.snap
@@ -215,7 +215,7 @@ Array [
           </nav>
           <a
             className="getInvolved"
-            href="/about-project/help"
+            href="/contact/volunteer"
           >
             Get Involved
           </a>
@@ -247,6 +247,7 @@ Array [
            
           <a
             href="/race"
+            onClick={[Function]}
           >
             We just launched the COVID Racial Data Tracker
           </a>
@@ -468,7 +469,7 @@ Array [
             </div>
             <a
               className="getInvolved"
-              href="/get-involved"
+              href="/contact/volunteer"
             >
               Get involved
             </a>
@@ -571,7 +572,7 @@ Array [
             </li>
             <li>
               <a
-                href="/license"
+                href="/about-data/license"
               >
                 License
               </a>
@@ -585,7 +586,7 @@ Array [
             </li>
             <li>
               <a
-                href="/accessibility"
+                href="/about/accessibility"
               >
                 Accessibility
               </a>
@@ -874,7 +875,7 @@ Array [
           </nav>
           <a
             className="getInvolved"
-            href="/about-project/help"
+            href="/contact/volunteer"
           >
             Get Involved
           </a>
@@ -906,6 +907,7 @@ Array [
            
           <a
             href="/race"
+            onClick={[Function]}
           >
             We just launched the COVID Racial Data Tracker
           </a>
@@ -1127,7 +1129,7 @@ Array [
             </div>
             <a
               className="getInvolved"
-              href="/get-involved"
+              href="/contact/volunteer"
             >
               Get involved
             </a>
@@ -1230,7 +1232,7 @@ Array [
             </li>
             <li>
               <a
-                href="/license"
+                href="/about-data/license"
               >
                 License
               </a>
@@ -1244,7 +1246,7 @@ Array [
             </li>
             <li>
               <a
-                href="/accessibility"
+                href="/about/accessibility"
               >
                 Accessibility
               </a>

diff --git a/src/__tests__/components/pages/homepage/__snapshots__/press.js.snap b/src/__tests__/components/pages/homepage/__snapshots__/press.js.snap
@@ -98,7 +98,7 @@ exports[`Components : Pages : Homepage : Press renders correctly 1`] = `
     </div>
     <a
       className="cta centered "
-      href="/about-project/in-the-press"
+      href="/about/press"
     >
       See what else our data powers
       <span

diff --git a/src/components/layout/footer.js b/src/components/layout/footer.js
@@ -27,15 +27,15 @@ const Footer = () => (
               <Link to="/terms-and-conditions">Terms and Conditions</Link>
             </li>
             <li>
-              <Link to="/license">License</Link>
+              <Link to="/about-data/license">License</Link>
             </li>
             <li>
               <a href="https://www.theatlantic.com/privacy-policy/">
                 Privacy Policy
               </a>
             </li>
             <li>
-              <Link to="/accessibility">Accessibility</Link>
+              <Link to="/about/accessibility">Accessibility</Link>
             </li>
             <li>
               <a href="/rss.xml">RSS</a>

diff --git a/src/components/layout/header/index.js b/src/components/layout/header/index.js
@@ -209,7 +209,10 @@ const Header = withSearch(
                   <div className={headerStyle.searchContainer}>
                     <HeaderSearch />
                   </div>
-                  <Link to="/get-involved" className={headerStyle.getInvolved}>
+                  <Link
+                    to="/contact/volunteer"
+                    className={headerStyle.getInvolved}
+                  >
                     Get involved
                   </Link>
                 </div>

diff --git a/src/components/layout/header/mobile-menu.js b/src/components/layout/header/mobile-menu.js
@@ -60,7 +60,7 @@ export default ({ expanded, topNavigation, subNavigation }) => {
         subNavigation={subNavigation}
         isMobile
       />
-      <Link to="/about-project/help" className={headerStyle.getInvolved}>
+      <Link to="/contact/volunteer" className={headerStyle.getInvolved}>
         Get Involved
       </Link>
       <div className={headerStyle.mobilePointer} />

diff --git a/src/components/layout/header/partnership-banner.js b/src/components/layout/header/partnership-banner.js
@@ -5,6 +5,18 @@ import partnershipBanner from './partnership-banner.module.scss'
 export default () => (
   <div className={partnershipBanner.banner}>
     <span className={partnershipBanner.new}>New</span>{' '}
-    <Link to="/race">We just launched the COVID Racial Data Tracker</Link>
+    <Link
+      to="/race"
+      onClick={() => {
+        if (
+          typeof window !== 'undefined' &&
+          typeof window.fathom !== 'undefined'
+        ) {
+          window.fathom.trackGoal('3GO7TUHI', 0)
+        }
+      }}
+    >
+      We just launched the COVID Racial Data Tracker
+    </Link>
   </div>
 )
diff --git a/src/components/pages/homepage/press.js b/src/components/pages/homepage/press.js
@@ -21,7 +21,7 @@ export default () => (
           <PressLogos onlyFeatured />
         </Col>
       </Row>
-      <CtaLink to="/about-project/in-the-press" centered>
+      <CtaLink to="/about/press" centered>
         See what else our data powers
       </CtaLink>
     </div>

diff --git a/src/components/search/search-no-results.js b/src/components/search/search-no-results.js
@@ -30,7 +30,7 @@ const SearchNoResult = ({ query = false }) =>
           methodology
         </li>
         <li>
-          <Link to="/api">Data API</Link> - Our data API for developers
+          <Link to="/data/api">Data API</Link> - Our data API for developers
         </li>
       </ul>
     </div>

diff --git a/src/data/navigation/header.yml b/src/data/navigation/header.yml
@@ -3,12 +3,12 @@ items:
   - title: Our Data
     link: /data
     subNavigation: data
-  - title: How to Use It
+  - title: About the Data
     link: /about-data
     subNavigation: about-data
-  - title: Why It Matters
-    link: /why-it-matters
-    subNavigation: why-it-matters
+  - title: Race and COVID-19
+    link: /race
+    subNavigation: race
   - title: About Us
     link: /about-project
     subNavigation: about-project

diff --git a/src/pages/about-project/index.js → src/pages/about/index.js b/src/pages/about-project/index.js → src/pages/about/index.js
@@ -9,7 +9,7 @@ import VolunteersList from '~components/common/volunteers-list'
 export default ({ data }) => (
   <Layout
     title="About Us"
-    path="/about-project"
+    path="/about"
     navigation={data.contentfulNavigationGroup.pages}
   >
     <LongContent>
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ const SearchNoResult = ({ query = false }) => @@
               methodology
             </li>
             <li>
-              <Link to="/api">Data API</Link> - Our data API for developers
+              <Link to="/data/api">Data API</Link> - Our data API for developers
             </li>
           </ul>
         </div>
@@ Expand Down @@