all is well

Author: agonzalez22

common/questions.tsx

@@ -584,51 +584,137 @@ export const PostAcceptanceFormSections: Array<QuestionSection | QuestionDefinit
   ),
   makeShortText('firstName', 'First name', true, 'First name'),
   makeShortText('lastName', 'Last name', true, 'Last name'),
-  makeDropdown('adult', 'Are you 18 years of age or older?', ['Yes', 'No'], true, 'Yes'),
-  makeSection(
-    <>Above 18 Signature</>,
-    'Complete this section only if you are above 18 years of age. If you are not, type in "N/A" and complete the following section accompanied by a parent or guardian.'
-  ),
+  // makeDropdown('adult', 'Are you 18 years of age or older?', ['Yes', 'No'], true, 'Yes'),
+  // makeSection(
+  //   <>Above 18 Signature</>,
+  //   'Complete this section only if you are above 18 years of age. If you are not, type in "N/A" and complete the following section accompanied by a parent or guardian.'
+  // ),
+  // makeShortText(
+  //   'adultSignature',
+  //   <div>
+  //     <p>
+  //       By typing my full legal name below, I acknowledge that this represents my legal signature
+  //       and that I have read and agreed to the terms and conditions stated in the Participant
+  //       Waiver.
+  //     </p>
+  //     PARTICIPANT WAIVER:{' '}
+  //     <a href="http://bit.ly/3XjlJEz" target="_blank" rel="noreferrer">
+  //       bit.ly/3XjlJEz
+  //     </a>
+  //   </div>,
+  //   true,
+  //   'First Last'
+  // ),
+  // makeSection(
+  //   <>Under 18 Signature</>,
+  //   'Complete this section only if you are under 18 years of age. If you are 18 years of age or over, mark "N/A" for both fields.'
+  // ),
   makeShortText(
-    'adultSignature',
+    'minorSignature',
     <div>
       <p>
-        By typing my full legal name below, I acknowledge that this represents my legal signature
-        and that I have read and agreed to the terms and conditions stated in the Participant
-        Waiver.
+        Attendee: I acknowledge that I am above 13 and that I have read and agreed to the terms and
+        conditions stated in the Participant Waiver.
       </p>
       PARTICIPANT WAIVER:{' '}
-      <a href="http://bit.ly/3XjlJEz" target="_blank" rel="noreferrer">
-        bit.ly/3XjlJEz
+      <a href="https://bit.ly/45hPv2G" target="_blank" rel="noreferrer">
+        bit.ly/45hPv2G
       </a>
     </div>,
     true,
     'First Last'
   ),
-  makeSection(
-    <>Under 18 Signature</>,
-    'Complete this section only if you are under 18 years of age. If you are 18 years of age or over, mark "N/A" for both fields.'
+  // makeShortText(
+  //   'guardianSignature',
+  //   'Guardian: I acknowledge that I am above 18 years of age. I have read and agreed to the terms and conditions stated in the Participant Waiver and will make sure the attendee follows the platform usage defined in the Media & Platform Release.',
+  //   true,
+  //   'First Last'
+  // ),
+  makeShortText('email', 'Email', true, 'email@example.com'),
+  makeShortText('phoneNumber', 'Phone Number', true, 'Phone Number'),
+  makeShortText('age', 'Age', true, 'Enter your age'),
+  makeDropdown(
+    'school',
+    'School',
+    Object.values(School).sort((a, b) => {
+      if (a === School['Northeastern University']) return -1;
+      if (b === School['Northeastern University']) return 1;
+
+      if (a === School['Other']) return 1;
+      if (b === School['Other']) return -1;
+      return a.localeCompare(b);
+    }),
+    true,
+    'School'
   ),
-  makeShortText(
-    'minorSignature',
-    <div>
-      <p>
-        Attendee: I acknowledge that I am above 13 and that I have read and agreed to the terms and
-        conditions stated in the Participant Waiver.
-      </p>
-      PARTICIPANT WAIVER:{' '}
-      <a href="http://bit.ly/3XjlJEz" target="_blank" rel="noreferrer">
-        bit.ly/3XjlJEz
+  makeDropdown(
+    'levelOfStudy',
+    'Level of Study',
+    Object.values(YearOfEducation),
+    true,
+    'Level of Study'
+  ),
+  makeShortText('countryOfResidence', 'Country of Residence', true, 'Country of Residence'),
+  makeSection(<>MLH Policies</>),
+  makeCheckbox(
+    'mlhCodeOfConduct',
+    <p>
+      I have read and agree to the{' '}
+      <a
+        href="https://github.com/MLH/mlh-policies/blob/main/code-of-conduct.md"
+        target="_blank"
+        rel="noopener noreferrer"
+        style={{ color: '#1890ff', textDecoration: 'underline' }}
+      >
+        MLH Code of Conduct
       </a>
-    </div>,
+    </p>,
+    [YesOrNo.Yes],
     true,
-    'First Last'
+    1
   ),
-  makeShortText(
-    'guardianSignature',
-    'Guardian: I acknowledge that I am above 18 years of age. I have read and agreed to the terms and conditions stated in the Participant Waiver and will make sure the attendee follows the platform usage defined in the Media & Platform Release.',
+  makeCheckbox(
+    'mlhApplicationSharingAuthorization',
+    <p>
+      I authorize you to share my application/registration information with Major League Hacking for
+      event administration, ranking, and MLH administration in-line with the{' '}
+      <a
+        href="https://github.com/MLH/mlh-policies/blob/main/privacy-policy.md"
+        target="_blank"
+        rel="noopener noreferrer"
+        style={{ color: '#1890ff', textDecoration: 'underline' }}
+      >
+        MLH Privacy Policy
+      </a>
+      . I further agree to the terms of both the{' '}
+      <a
+        href="https://github.com/MLH/mlh-policies/blob/main/contest-terms.md"
+        target="_blank"
+        rel="noopener noreferrer"
+        style={{ color: '#1890ff', textDecoration: 'underline' }}
+      >
+        MLH Contest Terms and Conditions
+      </a>{' '}
+      and the{' '}
+      <a
+        href="https://github.com/MLH/mlh-policies/blob/main/privacy-policy.md"
+        target="_blank"
+        rel="noopener noreferrer"
+        style={{ color: '#1890ff', textDecoration: 'underline' }}
+      >
+        MLH Privacy Policy
+      </a>
+    </p>,
+    [YesOrNo.Yes],
     true,
-    'First Last'
+    1
+  ),
+  makeCheckbox(
+    'mlhMarketingAuthorization',
+    'I authorize MLH to send me occasional emails about relevant events, career opportunities, and community announcements.',
+    [YesOrNo.Yes],
+    true,
+    1
   ),
 ];
 

common/types.ts

@@ -41,6 +41,15 @@ export interface PostAcceptanceResponses extends SharedResponses {
   minorSignature?: string;
   guardianSignature?: string;
   hangingWithFriends?: HangingWithFriends;
+  email?: string;
+  phoneNumber?: string;
+  age?: string;
+  school?: School;
+  levelOfStudy?: YearOfEducation;
+  countryOfResidence?: string;
+  mlhCodeOfConduct?: Array<string>;
+  mlhApplicationSharingAuthorization?: Array<string>;
+  mlhMarketingAuthorization?: Array<string>;
   zombieApocalypse?: ZombieApocalypse;
   takeOverNation?: TakeOverNation;
   aspirations?: Aspirations;

components/application/PostAcceptanceForm.tsx

@@ -19,6 +19,9 @@ export const PostAcceptanceForm: React.FC = () => {
   const { data: confirmByData } = useSWR('/api/v1/dates/confirm-by', getConfirmBy);
   const { data: submitted } = useSWR('/api/v1/status', getStatus);
 
+  const confirmBy = new Date(confirmByData.data);
+  confirmBy.setHours(confirmBy.getHours() - 5);
+
   return (
     <>
       <h1 className="app-header">Application Page</h1>
@@ -30,7 +33,7 @@ export const PostAcceptanceForm: React.FC = () => {
           <Form.Item noStyle>
             {confirmByData && (
               <p>
-                This RSVP form is DUE <strong>{formatDate(new Date(confirmByData.data))}</strong>.
+                This RSVP form is DUE <strong>{formatDate(new Date(confirmBy))}</strong>.
               </p>
             )}
           </Form.Item>
@@ -71,10 +74,10 @@ const AttendingForm: React.FC<AttendingFormProps> = ({ setAttendingState }) => {
       <p style={{ textAlign: 'center' }}>
         Please select if you will be attending HackBeanpot on the weekend of{' '}
         {/* TODO update location */}
-        <strong>February 13 - 15th, 2026 at Northeastern University Campus in Boston, MA</strong> .
-        Please keep in mind, the event this year is <strong>NOT</strong> overnight. Northeastern
-        University Campus is available for use from <strong>8:00 am - 11:00 pm</strong>. As such,
-        please arrange for appropriate accomodations during the event.
+        <strong>February 13 - 15th, 2026 at the Maven AGI office in Boston, MA</strong> . Please
+        keep in mind, the event this year is <strong>NOT</strong> overnight. The Maven AGI office is
+        available for use from <strong>8:00 am - 10:00 pm</strong>. As such, please arrange for
+        appropriate accomodations during the event.
       </p>
       <p>
         If you cannot make it, please select {'"No"'} so that we can admit others on the wait list

components/questions/short-test-question/ShortTextQuestion.tsx

@@ -9,6 +9,7 @@ type ShortTextProps = {
 };
 
 const ShortTextQuestion: FC<ShortTextProps> = ({ question, form, disabled }) => {
+  const isNumberInput = question.field === 'age';
   return (
     <Form.Item
       data-testid="shortText-question"
@@ -22,6 +23,7 @@ const ShortTextQuestion: FC<ShortTextProps> = ({ question, form, disabled }) =>
         data-testid="inputText3"
         disabled={disabled}
         placeholder={question.placeholder}
+        type={isNumberInput ? 'number' : 'text'}
         onChange={(e) => form.setFieldsValue({ [question.id]: e.target.value as string })}
       />
     </Form.Item>

pages/application.tsx

@@ -86,10 +86,11 @@ const FormDecider: React.FC<FormDeciderProps> = ({
   }
 
   if (
-    confirmByState === ConfirmByState.Before &&
-    decisionStatus === DecisionStatus.Admitted &&
-    rsvpStatus === RSVPStatus.Unconfirmed &&
-    showDecisionState
+    // confirmByState === ConfirmByState.Before &&
+    // decisionStatus === DecisionStatus.Admitted &&
+    // rsvpStatus === RSVPStatus.Unconfirmed &&
+    // showDecisionState
+    true
   ) {
     return <PostAcceptanceForm />;
   }