Merge branch 'main' into update-landing-909

Author: bruceplai

cypress/integration/pages/add-org.spec.js

@@ -5,9 +5,9 @@ describe('Add Organization Workflow', () => {
   const AUTOCOMPLETE_COUNTRY = 'united';
   const AUTOCOMPLETE_ORG = 'hack';
   const VALID_EMAIL = 'test@test.test';
-  const VALID_NAME = faker.company.companyName();
-  const VALID_NAME_2 = faker.company.companyName();
-  const VALID_PARENT_NAME = faker.company.companyName();
+  const VALID_NAME = `test_${faker.company.companyName()}`;
+  const VALID_NAME_2 = `test_${faker.company.companyName()}`;
+  const VALID_PARENT_NAME = `test_${faker.company.companyName()}`;
   const VALID_TAG = 'test-tag';
   const VALID_CITY = 'Los Angeles';
   const VALID_STATE = 'CA';

cypress/integration/pages/footer.spec.js

@@ -3,7 +3,7 @@ const faker = require('faker')
 describe('Footer', () => {
   const BAD_FORMAT_EMAIL = 'test@'
   const DUPLICATE_EMAIL = 'test@test.test'
-  const RANDOM_EMAIL = faker.internet.email();
+  const RANDOM_EMAIL = `test_${faker.internet.email()}`;
 
   before(() => {
     cy.visit('/')

src/App.js

@@ -22,7 +22,7 @@ import useStyles from './styles';
 const RouteTitled = ({ title, ...rest }) => {
   useEffect(() => {
     if (title) {
-      document.title = 'Civic Tech Index — ' + title;
+      document.title = `Civic Tech Index — ${title}`
     }
   });
 
@@ -51,7 +51,7 @@ const App = () => {
             <Route exact path='/organization/:name' component={IndvOrgPage} />
             {/* test and error page routes begin */}
             <RouteTitled path='/guides/:guide' component={Guides} title='Guides' />
-            <Route path='/404' component={Error404} />
+            <RouteTitled path='/404' component={Error404} title='404' />
             {/* test and error page routes end */}
             <Redirect from='/add' to='/join-index/how-to-add' />
             <Redirect from='/adding' to='/join-index/how-to-add' />

src/components/ContributorThumbnail.js

@@ -244,7 +244,6 @@ const Thumbnail = ({
           >
             <Link
               href={`/organization/${organization.slug}`}
-              target='_blank'
               rel='noreferrer noopener'
             >
               {organization.name ? organization.name : organization}

src/pages/Contributors/Affiliated.js

@@ -160,7 +160,6 @@ export const Affiliated = (props) => {
           >
             <Link
               href='/organization/code-for-all'
-              target='_blank'
               rel='noreferrer noopener'
             >
               Code for All

src/pages/IndvOrganization/index.js

@@ -120,6 +120,7 @@ const IndvOrgPage = ({ match }) => {
             };
             setupBreadCrumbs();
 
+            document.title = `Civic Tech Index — ${name}`
             setOrgName(name);
             setNotFound(false);
             setImageUrl(imageUrl);

src/pages/RadicalCollaboration/Share/styles.js

@@ -59,8 +59,6 @@ const useStyles = makeStyles((theme) => ({
     width: '218px',
   },
   media: {
-    display: 'flex',
-    justifyContent: 'center',
     height: '64px',
     width: '64px',
   },

src/theme-mui.js

@@ -132,6 +132,12 @@ const themeSettings = {
         },
       },
     },
+    MuiCardActionArea: {
+      root: {
+        display: 'flex',
+        width: 'auto',
+      },
+    },
     MuiCardContent: {
       root: {
         padding: 0,