From 062855f50e4c0e36fda5b49f5aa5d2393ff44e38 Mon Sep 17 00:00:00 2001 From: Anmol Brar <83686967+brarsanmol@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:46:00 -0500 Subject: [PATCH 1/5] fix: remove unused imports --- src/App.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 84845bf9..6a16500c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -23,7 +23,6 @@ import EditSponsorPage from './pages/Sponsor/Edit'; import SponsorSearchPage from './pages/Sponsor/Search'; import SponsorOnboardingPage from './pages/Sponsor/Onboarding'; import TeamPage from './pages/Team/index'; -import TravelPage from './pages/Travel/index'; import { FrontendRoute, @@ -46,7 +45,6 @@ import { canAccessApplication, canAccessHackerPass, canAccessTeam, - canAccessTravel, isSponsor, userCanAccessHackerPage, } from './util'; From e97b1f34722922eaaf535b387c93ed484ab22fd2 Mon Sep 17 00:00:00 2001 From: Anmol Brar <83686967+brarsanmol@users.noreply.github.com> Date: Sun, 22 Jan 2023 18:48:23 -0500 Subject: [PATCH 2/5] feat: travel api update (#978) * feat: remove remote options on acceptance * fix: remove attendance pref from review * fix(GeneralOnboarding.tsx): update onboarding information for mchacks 9. - update sponsor dashboard for McHacks9 - update GeneralOnboarding.tsx * chore: release 2.5.3 * fix: update discord onboarding guide to mchacks 9. * feat(GeneralOnboarding.tsx): add sponsor specific schedule to onboarding page. * feat: remove attendance preference * fix: remove unused type * feat: remove attendance preference * fix: remove unused type * fix: remove attendance pref from review * feat: remove attendance preference * fix: remove unused type * fix: remove attendance pref from review Co-authored-by: jenniferchen11 * Revert "feat: Add popup before hacker confirmation to collect location info (#943)" This reverts commit 2aef40fc85c8435c77ddeaa55c621deb398c48c4. Co-authored-by: jenniferchen11 * feat: remove travel page * fix: remove unused imports on App.tsx * feat: travel update (remove busses) (#977) * feat: travel update (remove busses) * fix: remove bus messages and unused imports Co-authored-by: jenniferchen11 --- src/App.tsx | 5 +- src/config/constants.ts | 4 +- src/pages/Travel/TravelStatusNone.tsx | 7 +- src/pages/Travel/TravelStatusOffered.tsx | 17 +---- src/pages/Travel/index.tsx | 92 +++++++++++------------- 5 files changed, 50 insertions(+), 75 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 6a16500c..ea55e005 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -49,6 +49,7 @@ import { userCanAccessHackerPage, } from './util'; import InvitePage from './pages/Admin/Invite'; +import TravelPage from './pages/Travel'; class App extends React.Component { public render() { @@ -200,7 +201,7 @@ class App extends React.Component { ) )} /> - {/**/} + /> = ({
Your request to recieve ${travel.request.toFixed(2)} in reimbursement for travel is still being processed. -
-
-

Bus

- {BUS_GENERAL_INFO} here.
); }; diff --git a/src/pages/Travel/TravelStatusOffered.tsx b/src/pages/Travel/TravelStatusOffered.tsx index a3ead586..8928dbd6 100644 --- a/src/pages/Travel/TravelStatusOffered.tsx +++ b/src/pages/Travel/TravelStatusOffered.tsx @@ -1,11 +1,6 @@ import * as React from 'react'; -import { - BUS_GENERAL_INFO, - BUS_SHOPIFY_PAGE, - ITravel, - TRAVEL_RECEIPTS_FORM, -} from '../../config'; +import { ITravel, TRAVEL_RECEIPTS_FORM } from '../../config'; import { LinkDuo } from '../../shared/Elements'; import DollarAmount from './DollarAmount'; @@ -34,22 +29,12 @@ const TravelStatusOffered: React.FunctionComponent = ({ ); - } else if (travel.request === 0) { - return ( -
- No reimbursement for travel was requested. -

Bus

- {BUS_GENERAL_INFO} here. -
- ); } else { return (
Unfortunately, we’re unable to offer you any travel reimbursement to McHacks. -

Bus

- {BUS_GENERAL_INFO} here.
); } diff --git a/src/pages/Travel/index.tsx b/src/pages/Travel/index.tsx index 97e5db8f..8da6259d 100644 --- a/src/pages/Travel/index.tsx +++ b/src/pages/Travel/index.tsx @@ -3,19 +3,11 @@ import Helmet from 'react-helmet'; import { Travel } from '../../api'; import { HACKATHON_NAME, ITravel, TRAVEL_POLICY } from '../../config'; -import { - BackgroundImage, - H1, - LinkDuo, - MaxWidthBox, -} from '../../shared/Elements'; +import { H1, LinkDuo, MaxWidthBox } from '../../shared/Elements'; import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator'; import WithToasterContainer from '../../shared/HOC/withToaster'; -import Train from '../../assets/images/train.svg'; - -import TravelStatusBus from './TravelStatusBus'; import TravelStatusClaimed from './TravelStatusClaimed'; import TravelStatusNone from './TravelStatusNone'; import TravelStatusOffered from './TravelStatusOffered'; @@ -26,24 +18,29 @@ import TravelStatusPolicy from './TravelStatusPolicy'; */ const TravelPage: React.FC = () => { // Travel details for signed in hacker - const [travel, setTravel] = useState(null); + const [travel, setTravel] = useState(Object()); // Is the page currently waiting for data? - const [isLoading, setIsLoading] = useState(true); + const [isLoading, setIsLoading] = useState(false); + + const getTravel = async () => { + try { + const newTravel = (await Travel.getSelf()).data.data; + setTravel(newTravel); + } catch (e) { + console.log(e); + if (e && e.data) { + ValidationErrorGenerator(e.data); + } + } + }; // When this component mounts, get signed in hacker's travel info useEffect(() => { (async () => { - try { - const newTravel = (await Travel.getSelf()).data.data; - setTravel(newTravel); - } catch (e) { - if (e && e.data) { - ValidationErrorGenerator(e.data); - } - } finally { - setIsLoading(false); - } + setIsLoading(true); + getTravel(); + setIsLoading(false); })(); }, []); @@ -55,9 +52,6 @@ const TravelPage: React.FC = () => { case 'None': reimbursement = ; break; - case 'Bus': - reimbursement = ; - break; case 'Policy': reimbursement = ; break; @@ -74,36 +68,36 @@ const TravelPage: React.FC = () => { } } + let content; + if (isLoading) { + content =
; + } else if (travel) { + content = ( + +

+ Travel +

+

Status

+ {reimbursement} +
+
+
+ Please ensure you've reviewed our{' '} + travel policy if using any of + our travel accommodation options. +
+ + ); + } else { + content =
; + } + return (
Travel | {HACKATHON_NAME} - {isLoading ? ( -
- ) : ( - -

- Travel -

-

Status

- {reimbursement} -
-
-
- Please ensure you've reviewed our{' '} - travel policy if using any of - our travel accommodation options. -
- - )} - + {content}
); }; From 52146f1cf5a569dd5cea83779c982da4d1b4c0c8 Mon Sep 17 00:00:00 2001 From: Anmol Brar Date: Mon, 23 Jan 2023 10:28:28 -0500 Subject: [PATCH 3/5] fix: merge conflicts, rebase branch --- src/App.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/App.tsx b/src/App.tsx index ea55e005..48b1b161 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -45,6 +45,7 @@ import { canAccessApplication, canAccessHackerPass, canAccessTeam, + canAccessTravel, isSponsor, userCanAccessHackerPage, } from './util'; From e7e3f5a695a91577dbb9378ea9924cedd96051f0 Mon Sep 17 00:00:00 2001 From: Anmol Brar <83686967+brarsanmol@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:30:55 -0500 Subject: [PATCH 4/5] chore: develop to v3 * feat: remove remote options on acceptance * fix: remove attendance pref from review * fix(GeneralOnboarding.tsx): update onboarding information for mchacks 9. - update sponsor dashboard for McHacks9 - update GeneralOnboarding.tsx * chore: release 2.5.3 * fix: update discord onboarding guide to mchacks 9. * feat(GeneralOnboarding.tsx): add sponsor specific schedule to onboarding page. * feat: remove attendance preference * fix: remove unused type * feat: remove attendance preference * fix: remove unused type * fix: remove attendance pref from review * feat: remove attendance preference * fix: remove unused type * fix: remove attendance pref from review Co-authored-by: jenniferchen11 * Revert "feat: Add popup before hacker confirmation to collect location info (#943)" This reverts commit 2aef40fc85c8435c77ddeaa55c621deb398c48c4. Co-authored-by: jenniferchen11 * feat: remove travel page * fix: remove unused imports on App.tsx * feat: travel update (remove busses) (#977) * feat: travel update (remove busses) * fix: remove bus messages and unused imports * feat: updated sponsor dashboard * feat: updated sponsor dashboard * fix: further updates to timing and removing discord specific wording * fix: removed live site and updated discord and schedule links --- src/features/Onboarding/DiscordOnboarding.tsx | 4 +- src/features/Onboarding/GeneralOnboarding.tsx | 50 +++++++++---------- src/features/Onboarding/Onboarding.tsx | 11 +--- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/src/features/Onboarding/DiscordOnboarding.tsx b/src/features/Onboarding/DiscordOnboarding.tsx index 8d0b69ea..dd6fb81d 100644 --- a/src/features/Onboarding/DiscordOnboarding.tsx +++ b/src/features/Onboarding/DiscordOnboarding.tsx @@ -32,7 +32,7 @@ const DiscordOnboarding: React.FC = () => (

What is a discord server?

  • - An invite-only home for the community - in our case, McHacks 9! If + An invite-only home for the community - in our case, McHacks 10! If you are a slack user, you can think of it like a Slack workspace. It is a place where you can talk, ask for help, get announcements, hang out, and have fun! @@ -88,7 +88,7 @@ const DiscordOnboarding: React.FC = () => ( minutes. Click the link and verify your Discord account
    • -

    How do I join the McHacks 9 Discord server?

    +

    How do I join the McHacks 10 Discord server?

    To join a server, click the "+" icon at the very bottom of the server list. diff --git a/src/features/Onboarding/GeneralOnboarding.tsx b/src/features/Onboarding/GeneralOnboarding.tsx index 7bd181fd..58b637cd 100644 --- a/src/features/Onboarding/GeneralOnboarding.tsx +++ b/src/features/Onboarding/GeneralOnboarding.tsx @@ -12,8 +12,8 @@ const GeneralOnboarding: React.FC = () => (

    Introduction

    Hey there, sponsor! We’re looking forward to seeing you for round - nine of McHacks, Canada’s original collegiate hackathon, on{' '} - January 21th! + ten of McHacks, Canada’s original collegiate hackathon, on{' '} + January 28th! Before the event, we’d like to offer you a pre-event outline of what to expect on the day-of.
    @@ -24,7 +24,7 @@ const GeneralOnboarding: React.FC = () => (

    For a sponsor specific schedule, you can find it{' '} - + here . We will be updating it as we continue receiving information from @@ -36,47 +36,47 @@ const GeneralOnboarding: React.FC = () => ( Discord. we recommend that you read our Discord Onboarding Guide first if you don’t know what Discord is. Once you are ready, join the channel by clicking - + this link.

    - When you join our Discord, please send a message to Lucy Chen on + When you join our Discord, please send a message to Andrew Kan on Discord with your name, company, and role so we can add you to the channel we will communicate with you on.

    - On January 21st, sponsor check-in will start at 6:00 p.m. on - Discord. Once you have logged onto Discord, message your coordinator + On January 28th, sponsor check-in will start at 8:00 a.m. . + Once you have logged onto Discord, message your coordinator to let them know you are ready to go! We ask you to check-in at - least 15 minutes before opening ceremonies at at 7:00 p.m. + least 15 minutes before opening ceremonies at at 10:00 a.m. + We also ask you to fill up the sponsor{' '} + + check-in form + .

    - If part of your package involves speaking at the opening ceremonies, - please ensure your video is uploaded to{' '} - - this form - - . If you are unable to provide a video, please let your coordinator + If you are scheduled to speak during the opening ceremony, + please email sponsor@mchacks.ca with your slides or video. If you are unable to provide a video, please let your coordinator know for accommodations.

    Sponsors

    - This year, our sponsors with recruiter passes will have their own - Discord channels. This is where you can interact with hackers and + This year, our sponsors with recruiter passes will have their own tables. + This is where you can interact with hackers and showcase your products! Make sure you have access to social media so that you can share your weekend with our audience and yours! There - are two important times we ask you to be online: + are two important times we ask you to be present:

    - 1. Tabling, Saturday 10:00am-12:00pm: Only applicable to + 1. Tabling, Saturday 12:00pm-5:00pm: Only applicable to sponsors with tabling in their package. This is your designated - sponsor booth slot. All hackers will know that you will be online - and in your channels at this time, so they will hop in to chat with + sponsor booth slot. All hackers will know that you will be in-person + and available at this time, so they will drop by to chat with you!

    - 2. Speed Networking, Saturday 2:00pm-4:00pm: Only applicable + 2. Speed Networking, Saturday 5:00pm-7:00pm: Only applicable to sponsors with speed networking in their package. If you would like to participate and you haven’t let your coordinator know, please do so as soon as possible. @@ -95,7 +95,7 @@ const GeneralOnboarding: React.FC = () => ( space where hackers can go themselves and find mentors.

    - Here is an important time we ask mentors to be online: + Here is an important time we ask mentors to be available:
    Saturday, 10:00am-12:00pm.
    @@ -127,7 +127,7 @@ const GeneralOnboarding: React.FC = () => (
    If you are interested in judging the other prizes and haven’t told your coordinator, please do so as we have a judging workshop on - Saturday at 4:00p.m. that is mandatory. + Sunday at 9:00a.m. or 10:30a.m. that is mandatory.

    Workshops {'&'} Mini Events

    If you are hosting a workshop or mini-event, they will be held @@ -151,8 +151,8 @@ const GeneralOnboarding: React.FC = () => ( {'{sponsor}'} channel.

    - In the event of an emergency, contact the co-directors Agnes - (+1 438-969-0186) or Logan (+1 908-328-9155). Please also contact + In the event of an emergency, contact the co-directors Jenny + (+1 905-621-6698) or Elisa (+1 705-790-8412). Please also contact any organizer for immediate assistance.

    diff --git a/src/features/Onboarding/Onboarding.tsx b/src/features/Onboarding/Onboarding.tsx index cb98168b..0087fdc5 100644 --- a/src/features/Onboarding/Onboarding.tsx +++ b/src/features/Onboarding/Onboarding.tsx @@ -47,15 +47,6 @@ export default class OnboardingContainer extends React.Component< any, any > { > Discord Onboarding - - - Schedule - - @@ -74,4 +65,4 @@ export default class OnboardingContainer extends React.Component< any, any > { ) } -} \ No newline at end of file +} From 4ce32240a1ad891ec870db7c586999d4178f3be4 Mon Sep 17 00:00:00 2001 From: William Zahary Henderson Date: Thu, 26 Jan 2023 14:18:58 -0500 Subject: [PATCH 5/5] Added new pronoun combinations --- src/config/pronouns.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/config/pronouns.ts b/src/config/pronouns.ts index 8c5e16df..6cb0a632 100644 --- a/src/config/pronouns.ts +++ b/src/config/pronouns.ts @@ -2,6 +2,10 @@ export enum Pronouns { SHE_HER = 'She/Her', HE_HIM = 'He/Him', THEY_THEM = 'They/Them', + HE_SHE = 'He/She', + HE_THEY = 'He/They', + SHE_THEY = 'She/They', + HE_SHE_THEY = 'He/She/They' } export default Pronouns;