From e8cfefd1bb4e3d47f8eec5f9de667667da56a922 Mon Sep 17 00:00:00 2001
From: Randell Dawson <5313213+RandellDawson@users.noreply.github.com>
Date: Thu, 18 Feb 2021 13:41:50 -0700
Subject: [PATCH] fix(tools): update default branch name to main (#41178)

---
 .../dashboard-app/client/src/components/FilenameResults.js  | 6 +++---
 .../dashboard-app/client/src/components/Pareto.js           | 6 +++---
 .../dashboard-app/client/src/components/PrResults.js        | 6 +++---
 tools/contributor/dashboard-app/server/tools/get-prs.js     | 2 --
 tools/contributor/sample.env                                | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tools/contributor/dashboard-app/client/src/components/FilenameResults.js b/tools/contributor/dashboard-app/client/src/components/FilenameResults.js
index 17c63d7d9f..24d2dbd652 100644
--- a/tools/contributor/dashboard-app/client/src/components/FilenameResults.js
+++ b/tools/contributor/dashboard-app/client/src/components/FilenameResults.js
@@ -20,12 +20,12 @@ const FilenameResults = ({ searchValue, results, rateLimitMessage }) => {
       return <ListItem number={number} username={username} prTitle={title} />;
     });
 
-    const fileOnMaster = `https://github.com/freeCodeCamp/freeCodeCamp/blob/master/${filename}`;
+    const fileOnMain = `https://github.com/freeCodeCamp/freeCodeCamp/blob/main/${filename}`;
     return (
       <Result key={filename}>
         <span style={filenameTitle}>{filename}</span>{' '}
-        <a href={fileOnMaster} rel="noopener noreferrer" target="_blank">
-          (File on Master)
+        <a href={fileOnMain} rel="noopener noreferrer" target="_blank">
+          (File on Main)
         </a>
         <List>{prs}</List>
       </Result>
diff --git a/tools/contributor/dashboard-app/client/src/components/Pareto.js b/tools/contributor/dashboard-app/client/src/components/Pareto.js
index 2266252bf9..647188cb77 100644
--- a/tools/contributor/dashboard-app/client/src/components/Pareto.js
+++ b/tools/contributor/dashboard-app/client/src/components/Pareto.js
@@ -137,12 +137,12 @@ class Pareto extends React.Component {
         const prsList = prs.map(({ number, username, title }) => {
           return <ListItem key={number} number={number} username={username} prTitle={title} />;
         });
-        const fileOnMaster = `https://github.com/freeCodeCamp/freeCodeCamp/blob/master/${filename}`;
+        const fileOnMain = `https://github.com/freeCodeCamp/freeCodeCamp/blob/main/${filename}`;
         return (
           <Result key={filename}>
             <span style={filenameTitle}>{filename}</span>{' '}
-            <a href={fileOnMaster} rel="noopener noreferrer" target="_blank">
-              (File on Master)
+            <a href={fileOnMain} rel="noopener noreferrer" target="_blank">
+              (File on Main)
           </a>
             <br />
             <details style={detailsStyle}>
diff --git a/tools/contributor/dashboard-app/client/src/components/PrResults.js b/tools/contributor/dashboard-app/client/src/components/PrResults.js
index 43478ff732..550bf24dcf 100644
--- a/tools/contributor/dashboard-app/client/src/components/PrResults.js
+++ b/tools/contributor/dashboard-app/client/src/components/PrResults.js
@@ -13,12 +13,12 @@ const PrResults = ({ searchValue, results, rateLimitMessage }) => {
   const elements = results.map((result, idx) => {
     const { number, filenames, username, title } = result;
     const files = filenames.map((filename, index) => {
-      const fileOnMaster = `https://github.com/freeCodeCamp/freeCodeCamp/blob/master/${filename}`;
+      const fileOnMain = `https://github.com/freeCodeCamp/freeCodeCamp/blob/main/${filename}`;
       return (
         <li key={`${number}-${index}`}>
           {filename}{' '}
-          <a href={fileOnMaster} rel="noopener noreferrer" target="_blank">
-            (File on Master)
+          <a href={fileOnMain} rel="noopener noreferrer" target="_blank">
+            (File on Main)
           </a>
         </li>
       );
diff --git a/tools/contributor/dashboard-app/server/tools/get-prs.js b/tools/contributor/dashboard-app/server/tools/get-prs.js
index 6cca25e491..7f0715b521 100644
--- a/tools/contributor/dashboard-app/server/tools/get-prs.js
+++ b/tools/contributor/dashboard-app/server/tools/get-prs.js
@@ -19,8 +19,6 @@ const getPRs = async () => {
   };
 
   const openPRs = await octokit.paginate(octokit.pulls.list, methodProps);
-  // const openPRs = await octokit.pulls.list(methodProps);
-  // console.log(openPRs[0])
   return openPRs;
 };
 
diff --git a/tools/contributor/sample.env b/tools/contributor/sample.env
index 4ee7480d9d..159ff3dbb9 100644
--- a/tools/contributor/sample.env
+++ b/tools/contributor/sample.env
@@ -2,7 +2,7 @@ GITHUB_USERNAME='camperbot'
 GITHUB_ACCESS_TOKEN=
 REPOSITORY_OWNER='freeCodeCamp'
 REPOSITORY='freeCodeCamp'
-DEFAULT_BASE='master'
+DEFAULT_BASE='main'
 PORT=3001
 MONGO_HOST=mongodb://localhost/contributor-tools
 MONGO_PORT=27017