Skip to content

Commit

Permalink
Promote dev to prod (#1018)
Browse files Browse the repository at this point in the history
* Remove Netlify link from README

* Removed Facebook eventPrompt; Fixed typo in application submission; Added phone number field to account creation. (#1005)

Co-authored-by: Joshua Zhou <[email protected]>

* Fix/fixed phone number input (#1006)

* Removed Facebook eventPrompt; Fixed typo in application submission; Added phone number field to account creation.

* Initialize phone number as inputted value in sign up form so it doesn't default to 11111111111

---------

Co-authored-by: Joshua Zhou <[email protected]>

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Add 3rd checkbox to Terms and Conditions (#1012)

* Add 3rd checkbox to Terms and Conditions #1010

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Added Jamie's changes for MLH checkbox, fixed merge conflicts.

* fixed dumb rebase error

---------

Co-authored-by: Tavi Pollard <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>

* Clear the fields and add success message after sending account invite (#1008)

* change-mchacks12

* change-mchacks12

* Remove Netlify link from README

* Removed Facebook eventPrompt; Fixed typo in application submission; Added phone number field to account creation. (#1005)

Co-authored-by: Joshua Zhou <[email protected]>

* Fix/fixed phone number input (#1006)

* Removed Facebook eventPrompt; Fixed typo in application submission; Added phone number field to account creation.

* Initialize phone number as inputted value in sign up form so it doesn't default to 11111111111

---------

Co-authored-by: Joshua Zhou <[email protected]>

* add success message and reset fields after an invite is successfully sent

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Add 3rd checkbox to Terms and Conditions (#1012)

* Add 3rd checkbox to Terms and Conditions #1010

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Added Jamie's changes for MLH checkbox, fixed merge conflicts.

* fixed dumb rebase error

---------

Co-authored-by: Tavi Pollard <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>

* change-mchacks12

---------

Co-authored-by: Mika Vohl <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>

* Fix/update grad years (#1015)

* Add 3rd checkbox to Terms and Conditions #1010

* Update Grad Years in Filter

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Clear the fields and add success message after sending account invite (#1008)

* change-mchacks12

* change-mchacks12

* Remove Netlify link from README

* Removed Facebook eventPrompt; Fixed typo in application submission; Added phone number field to account creation. (#1005)

Co-authored-by: Joshua Zhou <[email protected]>

* Fix/fixed phone number input (#1006)

* Removed Facebook eventPrompt; Fixed typo in application submission; Added phone number field to account creation.

* Initialize phone number as inputted value in sign up form so it doesn't default to 11111111111

---------

Co-authored-by: Joshua Zhou <[email protected]>

* add success message and reset fields after an invite is successfully sent

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Add 3rd checkbox to Terms and Conditions (#1012)

* Add 3rd checkbox to Terms and Conditions #1010

* MLH Form Changes (#1016)

* Updated level of study options to match MLH requirements

* #1000 - Update export from .tsv to .csv

* Changed hacker account form 'birthdate' field to 'age' #1003

* Added country of residence field to Other/Personal Details section of hacker application #1009

* Added country of residence field to the hacker application.

* add back CEGEP level of study.

---------

Co-authored-by: allennatang <[email protected]>

* Added Jamie's changes for MLH checkbox, fixed merge conflicts.

* fixed dumb rebase error

---------

Co-authored-by: Tavi Pollard <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>

* change-mchacks12

---------

Co-authored-by: Mika Vohl <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>

---------

Co-authored-by: Tavi Pollard <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Mika Vohl <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Tavi Pollard <[email protected]>

---------

Co-authored-by: Mika Vohl <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: Joshua Zhou <[email protected]>
Co-authored-by: allennatang <[email protected]>
Co-authored-by: Jamie Xiao <[email protected]>
  • Loading branch information
6 people authored Nov 15, 2024
1 parent 3a5af4e commit 623660d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11,590 deletions.
1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/config/gradYears.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
const GradYearList = [2020, 2021, 2022, 2023, 2024, 2025, 2026];
// const GradYearList = [2020, 2021, 2022, 2023, 2024, 2025, 2026];
const presentDate = new Date();
const presentYear = presentDate.getFullYear();
const GradYearList = [presentYear, presentYear+1, presentYear+2, presentYear+3, presentYear+4, presentYear+5, presentYear+6, presentYear+7, presentYear+8, presentYear+9, presentYear+10];
export const GradYears = GradYearList.map((v) => ({ label: v, value: v }));
10 changes: 8 additions & 2 deletions src/features/Invite/InviteForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import {
ErrorMessage,
FastField,
Formik,
FormikActions,
FormikProps,
FormikValues,
} from 'formik';
import React, { useState } from 'react';
import { toast } from 'react-toastify';
import { Account } from '../../api';
import { IInviteInfo, UserType } from '../../config';
import * as CONSTANTS from '../../config/constants';
Expand All @@ -32,7 +34,8 @@ export const InviteForm: React.FC<IInviteFormProps> = (props) => {
* Function called when formik form is submitted.
* @param values the formik values
*/
const handleSubmit = async (values: any) => {
// const handleSubmit = async (values: any) => {
const handleSubmit = async (values: FormikValues, {resetForm}: FormikActions<FormikValues>) => {
// Record that form is being submitted
setIsSubmitting(true);

Expand All @@ -50,6 +53,9 @@ export const InviteForm: React.FC<IInviteFormProps> = (props) => {
} finally {
setIsSubmitting(false);
}
toast.success("Sent!"); // success message pop-up
resetForm(); // reset the form values

};

/**
Expand Down Expand Up @@ -95,7 +101,7 @@ export const InviteForm: React.FC<IInviteFormProps> = (props) => {
<ErrorMessage component={FormikElements.Error} name="accountType" />
<SubmitBtn isLoading={isSubmitting} disabled={isSubmitting}>
Invite
</SubmitBtn>
</SubmitBtn>
</Form>
);
};
Expand Down
Loading

0 comments on commit 623660d

Please sign in to comment.