Update landing page (#909)

* 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

Author: bruceplai

.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/header.spec.js

@@ -1,12 +1,12 @@
 describe('Header component', () => {
   beforeEach(() => {
-    cy.visit('/home');
+    cy.visit('/');
   });
 
   it('loads nav links', () => {
     cy.viewport(1280, 800);
     cy.findLink('Join the Index')
-      .should('have.attr', 'href', '/home')
+      .should('have.attr', 'href', '/')
       .trigger('mouseover')
       .get('[data-cy=menuItem]')
       .within(() => {
@@ -15,7 +15,7 @@ describe('Header component', () => {
       });
 
     cy.findLink('Overview')
-      .should('have.attr', 'href', '/home')
+      .should('have.attr', 'href', '/')
       .trigger('mouseover')
       .get('[data-cy=menuItem]')
       .within(() => {
@@ -25,7 +25,7 @@ describe('Header component', () => {
       });
 
     cy.findLink('Radical Collaboration')
-      .should('have.attr', 'href', '/home')
+      .should('have.attr', 'href', '/')
       .trigger('mouseover')
       .get('[data-cy=menuItem]')
       .within(() => {
@@ -36,7 +36,7 @@ describe('Header component', () => {
       });
 
     cy.findLink('Index Contributors')
-      .should('have.attr', 'href', '/home')
+      .should('have.attr', 'href', '/')
       .trigger('mouseover')
       .get('[data-cy=menuItem]')
       .within(() => {

cypress/integration/pages/footer.spec.js

@@ -6,7 +6,7 @@ describe('Footer', () => {
   const RANDOM_EMAIL = faker.internet.email();
 
   before(() => {
-    cy.visit('/home')
+    cy.visit('/')
   })
 
   it('footer loads', () => {

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/landing.spec.js

@@ -63,7 +63,7 @@ describe('Contributors 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*=pageContainer]').should(

cypress/integration/pages/organizations.spec.js

@@ -12,7 +12,6 @@ import Faq from './pages/RadicalCollaboration/Faq';
 import IndvOrgPage from './pages/IndvOrganization';
 import Home from './pages/Home';
 import HowToUse from './pages/HowToUse';
-import Landing from './pages/Landing';
 import SearchProjects from './pages/SearchProjects';
 import TagCreator from './pages/TagCreator';
 import Error404 from './pages/Error404';
@@ -38,12 +37,11 @@ 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 path='/about/contact' component={Contact} title='Contact Us' />
             <RouteTitled exact path='/about/faq' component={Faq} title='FAQ' />
             <RouteTitled exact path='/organizations/:affiliation' component={Contributors} title='Organizations' />
-            <RouteTitled exact path='/home' component={Home} title='Home' />
             <RouteTitled exact path='/projects' component={SearchProjects} title='Search Projects' />
             <RouteTitled exact path='/join-index' component={TagCreator} title='Join the Index' />
             <RouteTitled exact path='/join-index/how-to-add' component={HowToUse} title='How to Add Your Project' />
@@ -76,8 +74,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>

src/App.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' alt='civic logo' />
       </Link>
       <div className={classes.flexContainer}>