Preptember cleaning (OperationCode#1216)

* put "Who We Serve" under about sublinks

* only lint and run unit tests in CI

* simplify coverage metrics

* sync up ignore files

* update sitemap

* remove allcontributors and update configs/dependencies

* fix mergify config

* explicitly set node version

* be explicit with yarn version

* nvm

* install packages, not node

* add cypress test status to mergify config

* update README

* force a new cypress build w/ a new commit

* re-add cypress in CI

Author: kylemh

.all-contributorsrc

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  cypress: cypress-io/cypress@1.25.0
+  cypress: cypress-io/cypress@1.26.0
 
 executors:
   default:

.circleci/config.yml

@@ -1,11 +1,13 @@
-common/styles/themeMap.js
+node_modules
+package.json
+yarn.lock
+.babelrc
+**/.babelrc
 .next
 .github
 bin
-node_modules
 static
-coverage
 cypress-coverage
 jest-coverage
-!.storybook
 .storybook-dist
+common/styles/themeMap.js

.eslintignore

@@ -1,16 +1,10 @@
-# Operation Code-specific
-backend
-
 # No npm allowed
 package-lock.json
 
 # Cypress local support artifacts
 cypress/screenshots
 cypress/videos
 
-# All Contributors
-!.all-contributorsrc
-
 # Logs
 logs
 *.log

.gitignore

@@ -3,15 +3,11 @@ pull_request_rules:
     conditions:
       - author=dependabot-preview[bot]
       - '#changes-requested-reviews-by=0'
-      - status-success=Vercel
-      - status-success=deploy/netlify
-      - 'status-success=ci/circleci: install_dependencies'
+      - 'status-success=Vercel - operation-code'
+      - 'status-success=Vercel - storybook'
       - 'status-success=ci/circleci: lint'
       - 'status-success=ci/circleci: unit_tests'
-      - 'status-success=ci/circleci: cypress_install'
-      - 'status-success=ci/circleci: integration_tests'
-      - 'status-success=ci/circleci: report_coverage'
-      - status-success=codeclimate
+      - 'status-success=cypress: all tests'
       - status-success=codeclimate/diff-coverage
       - status-success=codeclimate/total-coverage
     actions:

.mergify.yml

@@ -1,13 +1,13 @@
-common/styles/themeMap.js
+node_modules
 package.json
 yarn.lock
 .babelrc
 **/.babelrc
 .next
 .github
 bin
-node_modules
 static
 cypress-coverage
 jest-coverage
 .storybook-dist
+common/styles/themeMap.js

.prettierignore

@@ -10,7 +10,8 @@
     "**/*.js",
     "coverage/**/*",
     "cypress-coverage/**/*",
-    "jest-coverage/**/*"
+    "jest-coverage/**/*",
+    "node_modules/**/*"
   ],
   "rules": {
     "prettier/prettier": true,

.stylelintrc

@@ -1,6 +1,11 @@
 import flattenDepth from 'lodash/flattenDepth';
 
 // MARK: Links shared between nav and footer (no duplicate code)
+const whoWeServeLink = {
+  name: 'Who We Serve',
+  href: '/who_we_serve',
+};
+
 const contactLink = {
   name: 'Contact Us',
   href: '/contact',
@@ -27,11 +32,6 @@ const eventsLink = {
 };
 
 // MARK: Top-level navigation items
-const whoWeServeLink = {
-  name: 'Who We Serve',
-  href: '/who_we_serve',
-};
-
 const accountWithSublinks = {
   name: 'Account',
   href: '/login',
@@ -51,7 +51,7 @@ const accountWithSublinks = {
 const aboutUs = {
   name: 'About Us',
   href: '/about',
-  sublinks: [contactLink, faqLink, podcastLink],
+  sublinks: [whoWeServeLink, contactLink, faqLink, podcastLink],
 };
 
 const events = {
@@ -83,14 +83,8 @@ const logout = {
 };
 
 // MARK: Nav items
-export const loggedInNavItems = [aboutUs, whoWeServeLink, events, getInvolved, profile, logout];
-export const loggedOutNavItems = [
-  aboutUs,
-  whoWeServeLink,
-  events,
-  getInvolved,
-  accountWithSublinks,
-];
+export const loggedInNavItems = [aboutUs, events, getInvolved, profile, logout];
+export const loggedOutNavItems = [aboutUs, events, getInvolved, accountWithSublinks];
 
 // Extracts sublinks to list everything as a single, top-level list
 export const mobileLoggedInNavItems = flattenDepth(
@@ -135,10 +129,7 @@ export const footerItems = {
       name: 'Job Board',
     },
     eventsLink,
-    {
-      href: '/who_we_serve',
-      name: 'Who We Serve',
-    },
+    whoWeServeLink,
   ],
   column3: [
     getInvolvedLink,
@@ -174,12 +165,6 @@ export const footerItems = {
       href: '/terms',
       name: 'Terms of Use',
     },
-    // TODO: Create a link for this
-    // {
-    //   href: 'https://www.anotherfakeurl.com/',
-    //   name: 'Cookies',
-    //   analyticsEventLabel: 'Cookies',
-    // },
     {
       // NOTE: If you change this route, please update the redirect in `vercel.json` as well
       href: 'https://www.iubenda.com/privacy-policy/8174861',

README.md

@@ -19,6 +19,10 @@ exports[`Nav should render with no props passed 1`] = `
           "href": "/about",
           "name": "About Us",
         },
+        Object {
+          "href": "/who_we_serve",
+          "name": "Who We Serve",
+        },
         Object {
           "href": "/contact",
           "name": "Contact Us",
@@ -87,6 +91,10 @@ exports[`Nav should render with no props passed 1`] = `
             name="About Us"
             sublinks={
               Array [
+                Object {
+                  "href": "/who_we_serve",
+                  "name": "Who We Serve",
+                },
                 Object {
                   "href": "/contact",
                   "name": "Contact Us",
@@ -102,12 +110,6 @@ exports[`Nav should render with no props passed 1`] = `
               ]
             }
           />
-          <NavListItem
-            href="/who_we_serve"
-            icon={null}
-            name="Who We Serve"
-            sublinks={Array []}
-          />
           <NavListItem
             href="/events"
             icon={null}

common/constants/navigation.js

@@ -33,25 +33,22 @@ module.exports = {
   // An array of regexp pattern strings used to skip coverage collection
   coveragePathIgnorePatterns: [
     '<rootDir>/node_modules',
+    '<rootDir>/cypress',
     '<rootDir>/common/config',
     '<rootDir>/common/styles',
     '<rootDir>/common/constants',
     '<rootDir>/scripts',
-    '<rootDir>/cypress',
     '<rootDir>/test-utils',
 
-    // No real logic to test here
+    // // No real logic to test here
     '<rootDir>/common/utils/api-utils.js',
     '<rootDir>/components/ZipRecruiterJobs/ZipRecruiterJobs.js',
     '<rootDir>/components/Press/PressLinks/Articles.js',
     '<rootDir>/components/Timeline/historyData.js',
 
-    // Don't collect coverage from import/export mappers
+    // // Don't collect coverage from import/export mappers
     '<rootDir>/common/(.*)/index.js',
     '<rootDir>/components/(.*)/index.js',
-
-    // Ignore Next.js files
-    '<rootDir>/components/head.js',
   ],
 
   // A list of reporter names that Jest uses when writing coverage reports

components/Nav/__tests__/__snapshots__/Nav.test.js.snap

@@ -95,7 +95,6 @@
     "@testing-library/cypress": "^7.0.0",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.0.2",
-    "all-contributors-cli": "^6.17.2",
     "autoprefixer": "^9.8.6",
     "axios-mock-adapter": "^1.18.2",
     "babel-core": "7.0.0-bridge.0",

jest.config.js

@@ -37,7 +37,7 @@ function Join({ router }) {
         columns={[
           <RegistrationForm onSuccess={handleSuccess} />,
           <p>
-            Already registered?&nbsp;
+            {'Already registered? '}
             <Link href="/login">
               <a>Login</a>
             </Link>