Update landing page (#909)

bruceplai · bruceplai · commit f7c891cc09e1 · 2022-03-19T10:58:06.000-07:00
* Update Google Analytics measurement ID

* Update root route to point to homepage

* Simplify Layout

* Update breadcrumbs to use root route

* Update spec files to use root route

* Remove references to old landing page
diff --git a/.nycrc.json b/.nycrc.json
@@ -8,7 +8,6 @@
     "**/*.test.js",
     "src/guides/*.js",
     "src/icons/*.js",
-    "src/pages/Landing/*.js",
     "src/serviceWorker.js",
     "src/setupTests.js"
   ]
diff --git a/BOOKMARKS.md b/BOOKMARKS.md
@@ -33,7 +33,7 @@ browser) Test Server](https://test-civictechindexadmin.herokuapp.com/swagger/)
 [Our Swagger (API
 browser) Stage Server](https://api-stage.civictechindex.org/swagger/)
 
-[Civic Tech Index dot org Live Site](http://civictechindex.org/home)
+[Civic Tech Index dot org Live Site](http://civictechindex.org)
 
 ## Documentation and 3rd Party Links
 
diff --git a/cypress/fixtures/faqs.json b/cypress/fixtures/faqs.json
@@ -15,7 +15,7 @@
     {
       "id": 5,
       "question": "What is Civic Tech Index?",
-      "answer": "<a href=\"http://civictechindex.org/home\">Civic Tech Index</a> is a comprehensive, searchable index of all civic tech open-source software projects around the world. It helps to create large-scale engagement, overlapping technologies, and disciplines. People of all different skills and levels working to problem solve, projects that are legitimate and trustworthy.",
+      "answer": "<a href=\"http://civictechindex.org\">Civic Tech Index</a> is a comprehensive, searchable index of all civic tech open-source software projects around the world. It helps to create large-scale engagement, overlapping technologies, and disciplines. People of all different skills and levels working to problem solve, projects that are legitimate and trustworthy.",
       "view_count": 57
     },
     {
diff --git a/cypress/integration/components/footer.spec.js b/cypress/integration/components/footer.spec.js
@@ -6,8 +6,8 @@ describe('Footer', () => {
   const RANDOM_EMAIL = `test_${faker.internet.email()}`;
 
   before(() => {
-    cy.visit('/home');
-  });
+    cy.visit('/');
+  })
 
   it('footer loads', () => {
     cy.get('[class*=containerFooter]').within(() => {
diff --git a/cypress/integration/components/header.spec.js b/cypress/integration/components/header.spec.js
@@ -17,14 +17,14 @@ describe('Header component', () => {
   };
 
   beforeEach(() => {
-    cy.visit('/home');
+    cy.visit('/');
   });
 
   it('loads nav links', () => {
     cy.viewport(1280, 800);
     for (const headerItem in menuItems) {
       cy.findLink(headerItem)
-        .should('have.attr', 'href', '/home')
+        .should('have.attr', 'href', '/')
         .trigger('mouseover')
         .get('[data-cy=menu-item]')
         .within(() => {
diff --git a/cypress/integration/pages/home.spec.js b/cypress/integration/pages/home.spec.js
@@ -1,10 +1,6 @@
 describe('Home Page', () => {
   before(() => {
-    cy.visit('/home')
-  })
-
-  beforeEach(() => {
-    // cy.visit('/home')
+    cy.visit('/')
   })
 
   it('header loads', () => {
diff --git a/cypress/integration/pages/landing.spec.js b/cypress/integration/pages/landing.spec.js
diff --git a/cypress/integration/pages/organizations.spec.js b/cypress/integration/pages/organizations.spec.js
@@ -98,7 +98,7 @@ describe('Organizations Page (using API)', () => {
     cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`).as(
       'getOrganizations'
     );
-    cy.visit('/home');
+    cy.visit('/');
     cy.contains('View contributors').click();
     cy.wait('@getOrganizations');
     cy.get('[class*=containerWhite]').should(
diff --git a/src/App.js b/src/App.js
@@ -13,7 +13,6 @@ import Faq from './pages/Faq';
 import IndvOrgPage from './pages/IndvOrganization';
 import Home from './pages/Home';
 import HowToAdd from './pages/HowToAdd';
-import Landing from './pages/Landing';
 import SearchProjects from './pages/SearchProjects';
 import TagGenerator from './pages/TagGenerator';
 import Error404 from './pages/Error404';
@@ -43,7 +42,7 @@ const App = () => {
       <QueryParamProvider ReactRouterRoute={Route}>
         <Layout>
           <Switch>
-            <Route exact path='/' component={Landing} />
+            <RouteTitled exact path='/' component={Home} title='Home' />
             <RouteTitled exact path='/about' component={About} title='About' />
             <RouteTitled
               exact
@@ -130,8 +129,6 @@ const App = () => {
             <Redirect from='/taggenerator' to='/join-index' />
             {/* test and error page redirect begin */}
             <Redirect from='/guides' to='/guides/colors' />
-            <Redirect from='/placeholder' to='/blank' />
-            <Redirect from='/template' to='/blank' />
             <Redirect to='/404' />
             {/* test and error page redirect end */}
           </Switch>
diff --git a/src/components/Header/HeaderLarge.js b/src/components/Header/HeaderLarge.js
@@ -12,7 +12,7 @@ const HeaderLarge = () => {
 
   return (
     <nav className={classes.nav}>
-      <Link to='/home'>
+      <Link to='/'>
         <img
           className={classes.logo}
           src='/images/cti-logo.svg'
diff --git a/src/components/Header/HeaderSmall.js b/src/components/Header/HeaderSmall.js
@@ -19,7 +19,7 @@ const HeaderSmall = () => {
 
   return (
     <nav className={classes.nav}>
-      <Link to='/home'>
+      <Link to='/'>
         <img className={classes.logo} src='/images/cti-logo.svg' alt='civic logo' />
       </Link>
       <div
diff --git a/src/components/common/Layout.js b/src/components/common/Layout.js
@@ -3,16 +3,7 @@ import { withRouter } from "react-router-dom";
 import Footer from "../Footer";
 import Header from "../Header";
 
-const Layout = (props) => {
-  const { children, location } = props;
-
-  if (location.pathname === '/') {
-    return (
-      <>
-        {children}
-      </>
-    )
-  }
+const Layout = ({ children }) => {
   return (
     <>
       <Header />
diff --git a/src/index.js b/src/index.js
@@ -12,7 +12,7 @@ import App from './App';
 import * as serviceWorker from './serviceWorker';
 import themeMui from './theme-mui';
 
-const ga4react = new GA4React('G-5V7GWWCKF0'); // Google Analytics 4 measurement ID
+const ga4react = new GA4React('G-C68BN2R6GQ'); // Google Analytics 4 measurement ID
 const theme = createMuiTheme(themeMui);
 
 WebFont.load({
diff --git a/src/pages/About/index.js b/src/pages/About/index.js
@@ -12,7 +12,7 @@ import Grid from '@material-ui/core/Grid';
 
 const About = () => {
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
+    { name: 'Home', href: '/' },
     { name: 'About', href: '/about' },
   ];
 
diff --git a/src/pages/Collaborate/index.js b/src/pages/Collaborate/index.js
@@ -12,7 +12,7 @@ import { Typography } from '@material-ui/core';
 
 const Collaborate = () => {
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
+    { name: 'Home', href: '/' },
     { name: 'Collaborate with Us', href: '/support/collaborate' },
   ];
 
diff --git a/src/pages/Contact/index.js b/src/pages/Contact/index.js
@@ -8,7 +8,7 @@ import { GenericHeaderSection } from '../../components/';
 
 const Contact = () => {
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
+    { name: 'Home', href: '/' },
     { name: 'Contact', href: '/about/contact' },
   ];
   const handlePageHeight = () => {
diff --git a/src/pages/Contributors/index.js b/src/pages/Contributors/index.js
@@ -246,7 +246,7 @@ export default function Contributors() {
   };
 
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
+    { name: 'Home', href: '/' },
     { name: 'Civic Tech Organizations', href: '/organizations/all' },
   ];
 
diff --git a/src/pages/Donate/index.js b/src/pages/Donate/index.js
@@ -11,7 +11,7 @@ import { GenericHeaderSection } from '../../components';
 const Donate = () => {
   const classes = useStyles();
   const breadCrumbLinks = [
-    { href: '/home', name: 'Home' },
+    { href: '/', name: 'Home' },
     { href: '/support/donate', name: 'Donate' },
   ];
 
diff --git a/src/pages/Faq/index.js b/src/pages/Faq/index.js
@@ -43,7 +43,7 @@ const Faq = () => {
   );
 
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
+    { name: 'Home', href: '/' },
     { name: 'FAQ', href: '/about/faq' },
   ];
 
diff --git a/src/pages/HowToAdd/index.js b/src/pages/HowToAdd/index.js
@@ -38,7 +38,7 @@ const HowToAdd = () => {
   const clipboard = useClipboard();
   const classes = useStyles();
   const breadCrumbLinks = [
-    { href: '/home', name: 'Home' },
+    { href: '/', name: 'Home' },
     { href: '/join-index/how-to-add', name: 'How to Add Your Project' },
   ];
   const copyText = (e, text) => {
diff --git a/src/pages/IndvOrganization/index.js b/src/pages/IndvOrganization/index.js
@@ -102,7 +102,7 @@ const IndvOrgPage = ({ match }) => {
             // Create the breadcrums on the Individual Organization Page
             const parentOrgs = [];
             const crumbs = [
-              { name: 'Home', href: '/home' },
+              { name: 'Home', href: '/' },
               { name: 'View Organization', href: '/organizations/all' },
               {
                 name: name,
diff --git a/src/pages/Landing/index.js b/src/pages/Landing/index.js
diff --git a/src/pages/Landing/styles.js b/src/pages/Landing/styles.js
diff --git a/src/pages/Placeholder.js b/src/pages/Placeholder.js
diff --git a/src/pages/RadicalCollaboration/index.js b/src/pages/RadicalCollaboration/index.js
diff --git a/src/pages/SearchProjects/HeaderSection.js b/src/pages/SearchProjects/HeaderSection.js
diff --git a/src/pages/Share/index.js b/src/pages/Share/index.js
diff --git a/src/pages/TagGenerator/AddOrgForm/PageTitle.js b/src/pages/TagGenerator/AddOrgForm/PageTitle.js
diff --git a/src/pages/TagGenerator/index.js b/src/pages/TagGenerator/index.js

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`"*/.test.js",`
`9`	`9`	`"src/guides/*.js",`
`10`	`10`	`"src/icons/*.js",`
`11`		`- "src/pages/Landing/*.js",`
`12`	`11`	`"src/serviceWorker.js",`
`13`	`12`	`"src/setupTests.js"`
`14`	`13`	`]`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`{`
`16`	`16`	`"id": 5,`
`17`	`17`	`"question": "What is Civic Tech Index?",`
`18`		`- "answer": "<a href=\"http://civictechindex.org/home\">Civic Tech Index</a> is a comprehensive, searchable index of all civic tech open-source software projects around the world. It helps to create large-scale engagement, overlapping technologies, and disciplines. People of all different skills and levels working to problem solve, projects that are legitimate and trustworthy.",`
	`18`	`+ "answer": "<a href=\"http://civictechindex.org\">Civic Tech Index</a> is a comprehensive, searchable index of all civic tech open-source software projects around the world. It helps to create large-scale engagement, overlapping technologies, and disciplines. People of all different skills and levels working to problem solve, projects that are legitimate and trustworthy.",`
`19`	`19`	`"view_count": 57`
`20`	`20`	`},`
`21`	`21`	`{`