Updated 'degree' options for application form to match MLH requirements

README.md

@@ -1,7 +1,5 @@
 # [McHacks Dashboard](https://app.mchacks.ca)
 
-[![Netlify Status](https://api.netlify.com/api/v1/badges/909350ee-5bb5-47c4-88e3-81c1de52db92/deploy-status)](https://app.netlify.com/sites/mchacks-dashboard/deploys)
-
 This repository contains the code for the hackathon dashboard of [McHacks](https://mchacks.ca), Canada's favourite hackathon hosted annually at McGill University. It connects with our [API](https://github.com/hackmcgill/hackerAPI) and is hosted at [app.mchacks.ca](https://app.mchacks.ca).
 
 ## Folder Structure

src/config/constants.ts

@@ -143,7 +143,7 @@ export const TRAVEL_REQUEST_REASON_LABEL = 'Reason';
 export const PREVIOUS_HACKATHONS_LABEL =
   'How many hackathons have you been to?';
 export const REVIEW_APPLICIATION_DESCRIPTION =
-  'Your are about to submit. Please review your application before submitting. You won’t be able to edit your responses later.';
+  'You are about to submit. Please review your application before submitting. You won’t be able to edit your responses later.';
 
 // Invite Page
 export const ACCOUNT_TYPE_LABEL = 'Account type';

src/config/degrees.ts

@@ -1,7 +1,14 @@
 export enum Degrees {
-  HIGHSCHOOL = 'High School',
-  CEGEP = 'CEGEP',
-  UNDERGRADUATE = 'Undergraduate',
-  GRADUATE = 'Graduate',
+  LESS_THAN_SECONDARY = 'Less than Secondary / High School',
+  SECONDARY = 'Secondary / High School',
+  COLLEGE = 'Undergraduate University (2 year - community college or similar)',
+  UNDERGRADUATE = 'Undergraduate University (3+ year)',
+  GRADUATE = 'Graduate University (Masters, Professional, Doctoral, etc)',
+  CODE_SCHOOL = 'Code School / Bootcamp',
+  VOCATIONAL = 'Other Vocational / Trade Program or Apprenticeship',
+  POSTDOC = 'Post Doctorate',
+  OTHER = 'Other',
+  NOT_STUDENT = "I'm not currently a student",
+  NO_ANSWER = 'Prefer not to answer'
 }
 export default Degrees;

src/features/Account/ManageAccountForm.tsx

@@ -128,8 +128,7 @@ const ManageAccountForm: React.FC<IManageAccountProps> = (props) => {
     id: accountId,
     lastName: values.lastName,
     password: values.password,
-    phoneNumber:
-      props.mode === ManageAccountModes.EDIT ? values.phoneNumber : 11111111111,
+    phoneNumber: values.phoneNumber,
     pronoun: values.pronoun,
     gender: values.gender,
     dietaryRestrictions: settings.isRemote
@@ -281,18 +280,21 @@ const ManageAccountForm: React.FC<IManageAccountProps> = (props) => {
             name={'newPassword'}
           />
           <ErrorMessage component={FormikElements.Error} name="newPassword" />
-          <FastField
-            component={FormikElements.FormattedNumber}
-            label={CONSTANTS.PHONE_NUMBER_LABEL}
-            placeholder="+# (###) ###-####"
-            format="+# (###) ###-####"
-            name={'phoneNumber'}
-            required={true}
-            value={fp.values.phoneNumber}
-          />
-          <ErrorMessage component={FormikElements.Error} name="phoneNumber" />
         </>
       )}
+
+      <FastField
+        component={FormikElements.FormattedNumber}
+        label={CONSTANTS.PHONE_NUMBER_LABEL}
+        placeholder="+# (###) ###-####"
+        format="+# (###) ###-####"
+        name={'phoneNumber'}
+        required={true}
+        value={fp.values.phoneNumber}
+      />
+      <ErrorMessage component={FormikElements.Error} name="phoneNumber" />
+
+
       <FastField
         component={FormikElements.Select}
         creatable={true}

src/features/Application/ManageApplicationForm.tsx

@@ -1179,18 +1179,6 @@ const ManageApplicationForm: React.FunctionComponent<
               </GridTwoColumn>
             </>
           ) : null}
-
-          <div className="eventPrompt">
-            Make sure to mark yourself as going to our{' '}
-            <a
-              href={CONSTANTS.FACEBOOK_EVENT_URL}
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              Facebook event
-            </a>
-            !
-          </div>
         </div>
 
         <div className="buttons">