Update landing page (#909)

.nycrc.json

@@ -8,7 +8,6 @@
     "**/*.test.js",
     "src/guides/*.js",
     "src/icons/*.js",
-    "src/pages/Landing/*.js",
     "src/serviceWorker.js",
     "src/setupTests.js"
   ]

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
 

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
     },
     {

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(() => {

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(() => {

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', () => {

cypress/integration/pages/organizations.spec.js

@@ -145,7 +145,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(

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 TagGeneratorWizard from './pages/TagGeneratorWizard';
 import Error404 from './pages/Error404';
@@ -51,7 +50,7 @@ const App = () => {
       <QueryParamProvider ReactRouterRoute={Route}>
         <Layout>
           <Switch>
-            <Route exact path='/' component={Landing} />
+            <RouteTitled exact path='/' component={Home} title='Home' />
             <RouteTitled exact path='/about/what-is-cti' component={WhatIsCTI} title='What is CTI?' />
             <RouteTitled
               exact
@@ -126,6 +125,7 @@ const App = () => {
             <Redirect from='/donate' to='/radical-collaboration/donate' />
             <Redirect from='/donation' to='/radical-collaboration/donate' />
             <Redirect from='/faq' to='/about/faq' />
+            <Redirect from='/home' to='/' />
             <Redirect from='/how' to='/join-index/how-to-add' />
             <Redirect from='/how-to' to='/join-index/how-to-add' />
             <Redirect from='/how-to-use' to='/join-index/how-to-add' />
@@ -141,8 +141,6 @@ const App = () => {
             <Redirect from='/taggenerator' to='/join-index/tag-generator-wizard' />
             {/* 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>

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'

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

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 />

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({

src/pages/Collaborate/index.js

@@ -12,8 +12,8 @@ import { Typography } from '@material-ui/core';
 
 const Collaborate = () => {
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
-    { name: 'Collaborate with Us', href: '/radical-collaboration/collaborate' },
+    { href: '/', name: 'Home' },
+    { href: '/radical-collaboration/collaborate', name: 'Collaborate with Us' },
   ];
 
   return (

src/pages/Contact/index.js

@@ -8,8 +8,8 @@ import { GenericHeaderSection } from '../../components/';
 
 const Contact = () => {
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
-    { name: 'Contact', href: '/about/contact' },
+    { href: '/', name: 'Home' },
+    { href: '/about/contact', name: 'Contact' },
   ];
   const handlePageHeight = () => {
     window.parent.scrollTo(0, 0);

src/pages/Contributors/index.js

@@ -264,8 +264,8 @@ export default function Contributors() {
   };
 
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
-    { name: 'Civic Tech Organizations', href: '/organizations' },
+    { href: '/', name: 'Home' },
+    { href: '/organizations', name: 'Civic Tech Organizations' },
   ];
 
   return (

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: '/radical-collaboration/donate', name: 'Donate' },
   ];
 

src/pages/Faq/index.js

@@ -43,8 +43,8 @@ const Faq = () => {
   );
 
   const breadCrumbLinks = [
-    { name: 'Home', href: '/home' },
-    { name: 'FAQ', href: '/about/faq' },
+    { href: '/', name: 'Home' },
+    { href: '/about/faq', name: 'FAQ' },
   ];
 
   const getFaqData = async (currentQuery, resetState) => {

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) => {

src/pages/IndvOrganization/index.js

@@ -102,8 +102,8 @@ const IndvOrgPage = ({ match }) => {
             // Create the breadcrums on the Individual Organization Page
             const parentOrgs = [];
             const crumbs = [
-              { name: 'Home', href: '/home' },
-              { name: 'View Organization', href: '/organizations/all' },
+              { href: '/', name: 'Home' },
+              { href: '/organizations/all', name: 'View Organization' },
               {
                 name: name,
                 href: