added rubric updates

.github/workflows/firebase-hosting-merge.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npm ci && npm run build
+      - run: yarn install --frozen-lockfile && yarn run build
         env:
           NEXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.NEXT_PUBLIC_FIREBASE_API_KEY }}
           NEXT_PUBLIC_FIREBASE_APP_ID: ${{ secrets.NEXT_PUBLIC_FIREBASE_APP_ID }}

.github/workflows/firebase-hosting-pull-request.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Install and Build
-        run: npm ci && npm run build
+        run: yarn install --frozen-lockfile && yarn run build
         env:
           NEXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.DEV_NEXT_PUBLIC_FIREBASE_API_KEY }}
           NEXT_PUBLIC_FIREBASE_APP_ID: ${{ secrets.DEV_NEXT_PUBLIC_FIREBASE_APP_ID }}

components/Evaluator/Scoring.js

@@ -12,8 +12,8 @@ import {
   MAX_SCORE,
   SCORING,
   TAGS,
-  ASSESSMENT_COLOR,
-  BONUS_SCORING,
+  // ASSESSMENT_COLOR,
+  // BONUS_SCORING,
 } from '../../constants';
 import { AuthContext } from '../../utility/auth';
 import { updateApplicantScore } from '../../utility/firebase';
@@ -48,9 +48,9 @@ const SmallText = styled.div`
   color: ${COLOR.GREY_500};
 `;
 
-const Label = styled.p`
-  color: ${ASSESSMENT_COLOR.LIGHT_GRAY};
-`;
+// const Label = styled.p`
+//   color: ${ASSESSMENT_COLOR.LIGHT_GRAY};
+// `;
 
 export default function Scoring({ shouldDisplay, applicant }) {
   const [scores, setScores] = useState({});
@@ -66,11 +66,13 @@ export default function Scoring({ shouldDisplay, applicant }) {
   }, [applicant?._id]);
 
   const qualifyingBonus = () => {
-    const { skills } = applicant;
-    return !skills?.hackathonsAttended
-      ? BONUS_SCORING.FIRST_TIME_HACKER.value *
-          BONUS_SCORING.FIRST_TIME_HACKER.weight
-      : 0;
+    return false;
+    // manually input if hacker is first time
+    // const { skills } = applicant;
+    // return !skills?.hackathonsAttended
+    //   ? BONUS_SCORING.FIRST_TIME_HACKER.value *
+    //       BONUS_SCORING.FIRST_TIME_HACKER.weight
+    //   : 0;
   };
 
   // TODO: For next hackathon, change to camelCase.
@@ -87,6 +89,12 @@ export default function Scoring({ shouldDisplay, applicant }) {
       case SCORING.ESSAY2.label:
         field = 'ResponseTwoScore';
         break;
+      case SCORING.ESSAY3.label:
+        field = 'ResponseThreeScore';
+        break;
+      case SCORING.ESSAY4.label:
+        field = 'ResponseFourScore';
+        break;
       default:
         break;
     }
@@ -116,16 +124,32 @@ export default function Scoring({ shouldDisplay, applicant }) {
           handleClick={handleClick}
           score={scores?.ResponseOneScore}
           maxScore={SCORING.ESSAY1}
+          hasMinusOne
         />
         <ScoreInput
           label={SCORING.ESSAY2.label}
           handleClick={handleClick}
           score={scores?.ResponseTwoScore}
           maxScore={SCORING.ESSAY2}
+          hasMinusOne
         />
-        {!applicant?.skills?.hackathonsAttended && (
-          <Label>First time hacker: + 0.5</Label>
-        )}
+        <ScoreInput
+          label={SCORING.ESSAY3.label}
+          handleClick={handleClick}
+          score={scores?.ResponseThreeScore}
+          maxScore={SCORING.ESSAY3}
+          hasMinusOne
+        />
+        <ScoreInput
+          label={SCORING.ESSAY4.label}
+          handleClick={handleClick}
+          score={scores?.ResponseFourScore}
+          maxScore={SCORING.ESSAY4}
+          hasMinusOne
+        />
+        {/* {!applicant?.skills?.hackathonsAttended && (
+          <Label>First time hacker: +1</Label>
+        )} */}
         <TextField
           customValue={comment}
           onChangeCustomValue={(e) => setComment(e.target.value)}

components/Evaluator/scoreInput.js

@@ -18,8 +18,16 @@ const Label = styled.label`
   color: ${ASSESSMENT_COLOR.LIGHT_GRAY};
 `;
 
-export default function ScoreInput({ label, score, handleClick, maxScore }) {
-  const arr = [...Array(maxScore.value + 1).keys()];
+export default function ScoreInput({
+  label,
+  score,
+  handleClick,
+  maxScore,
+  hasMinusOne,
+}) {
+  const arr = hasMinusOne
+    ? [-1, ...Array(maxScore.value + 1).keys()]
+    : [...Array(maxScore.value + 1).keys()];
 
   const handleMultipier = (value, numberLabel) => {
     return handleClick(value * maxScore.weight, numberLabel);

constants.js

@@ -131,7 +131,7 @@ export const APPLICATION_STATUS = {
 export const SCORING = {
   RESUME: {
     label: 'Resume',
-    value: 7,
+    value: 5,
     weight: 1,
   },
   ESSAY1: {
@@ -144,6 +144,16 @@ export const SCORING = {
     value: 4,
     weight: 1,
   },
+  ESSAY3: {
+    label: 'Long Answer 3 (optional)',
+    value: 4,
+    weight: 1,
+  },
+  ESSAY4: {
+    label: 'Long Answer 4 (optional)',
+    value: 4,
+    weight: 1,
+  },
 };
 
 export const BONUS_SCORING = {
@@ -176,9 +186,8 @@ export const TABS = {
 export const RUBRIC = {
   DEV: [
     {
-      score: '+2',
-      label:
-        'At least 2 small projects or 1 big project (personal, hackathon, or school projects) (1 point for each small project)',
+      score: '+1',
+      label: 'At least 1 tech-related project',
     },
     {
       score: '+1',
@@ -193,22 +202,13 @@ export const RUBRIC = {
       score: '+1',
       label: 'At least one tech-related extracurricular activity',
     },
-    {
-      score: '+1',
-      label: 'If have won a hackathon (won: 1st, 2nd, 3rd)',
-    },
     {
       score: '+1',
       label:
         'Easy to read, clean, well made (something you would do to apply to a job)',
     },
   ],
   DESIGN: [
-    {
-      score: '+2',
-      label:
-        'At least 2 small projects or 1 big project (personal, hackathon, school) (1 point for each small project)',
-    },
     {
       score: '+1',
       label:
@@ -220,7 +220,8 @@ export const RUBRIC = {
     },
     {
       score: '+1',
-      label: 'If at least one job is design-related',
+      label:
+        'if any of the work experiences are tech-related (work or internship)',
     },
     {
       score: '+1',
@@ -241,18 +242,10 @@ export const RUBRIC = {
       score: '+1',
       label: 'At least 1 small project/experience',
     },
-    {
-      score: '+1',
-      label: 'If project/experience related to tech',
-    },
     {
       score: '+1',
       label: 'For each extracurricular activity (1 point each, max 2 points)',
     },
-    {
-      score: '+1',
-      label: 'If extracurricular activities are tech-related',
-    },
     {
       score: '+1',
       label: