More pronouns

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,
@@ -51,6 +50,7 @@ import {
   userCanAccessHackerPage,
 } from './util';
 import InvitePage from './pages/Admin/Invite';
+import TravelPage from './pages/Travel';
 
 class App extends React.Component {
   public render() {
@@ -202,7 +202,7 @@ class App extends React.Component {
                 )
               )}
             />
-            {/*<Route
+            <Route
               exact={true}
               path={FrontendRoute.TRAVEL_PAGE}
               component={withNavbar(
@@ -219,7 +219,7 @@ class App extends React.Component {
                 ),
                 { activePage: 'travel' }
               )}
-              />*/}
+            />
             <Route
               exact={true}
               path={FrontendRoute.LOGIN_PAGE}

src/config/constants.ts

@@ -25,8 +25,8 @@ export const BUS_SLACK_PAGE =
   'https://join.slack.com/t/mchacks7/shared_invite/enQtOTA3MDc2NDU4OTAyLTI0ZWU1N2VkOGExZTA3NDg3Y2JiMGE3MGE2ZmU4MGRlYjI3YmZlYjAxYmI0OTk2ZjZjYTE0ZjNhYmY0ZDNmZmU';
 export const BUS_SLACK_CHANNEL = '#bus-toronto channel';
 export const TRAVEL_POLICY =
-  'https://docs.google.com/document/d/1K8WSGQtWfKrybT_O9WrxIp93dETrv3jhy71fkHKZwdM';
-export const TRAVEL_RECEIPTS_FORM = 'https://forms.gle/TdxUaUn31WzXcPvu6';
+  'https://docs.google.com/document/d/1S5RIgVjb2PXCLRNFc6uQKPxLU40uNwiEY5jwfkVOMA0';
+export const TRAVEL_RECEIPTS_FORM = 'https://forms.gle/wVDQCPPxhum4pGVc7';
 
 // Social media
 export const FACEBOOK_EVENT_URL =

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;

src/features/Onboarding/DiscordOnboarding.tsx

@@ -32,7 +32,7 @@ const DiscordOnboarding: React.FC = () => (
           <h2>What is a discord server?</h2>
           <ul>
             <li>
-              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
             </li>
           </ol>
-          <h2>How do I join the McHacks 9 Discord server?</h2>
+          <h2>How do I join the McHacks 10 Discord server?</h2>
           <p>
             To join a server, click the "+" icon at the very bottom of the
             server list.

src/features/Onboarding/GeneralOnboarding.tsx

@@ -12,8 +12,8 @@ const GeneralOnboarding: React.FC = () => (
           <h2>Introduction</h2>
           <p>
             Hey there, sponsor! We’re looking forward to seeing you for round
-            nine of McHacks, Canada’s original collegiate hackathon, on{' '}
-            <b>January 21th! </b>
+            ten of McHacks, Canada’s original collegiate hackathon, on{' '}
+            <b>January 28th! </b>
             Before the event, we’d like to offer you a pre-event outline of what
             to expect on the day-of.
             <br />
@@ -24,7 +24,7 @@ const GeneralOnboarding: React.FC = () => (
             <br />
             <br />
             For a sponsor specific schedule, you can find it{' '}
-            <LinkDuo to="https://docs.google.com/spreadsheets/d/1p1RxMcBnCGBlBJMznkvuW9u_rYtbbKno15VjXfrolao/edit?usp=sharing">
+            <LinkDuo to="https://docs.google.com/document/d/1ClrMBzOffam8vU00YCq_YPFAVaYFnBKR0CEILWQsirg/edit?usp=sharing">
               here
             </LinkDuo>
             . 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
-            <LinkDuo to="https://discord.gg/fqbjr43cKf">
+            <LinkDuo to="https://discord.com/invite/6W25XWfHUr">
               <span> this link. </span>
             </LinkDuo>
             <br />
             <br />
-            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.
             <br />
             <br />
-            On January 21st, sponsor check-in will start at <b>6:00 p.m. </b>on
-            Discord. Once you have logged onto Discord, message your coordinator
+            On January 28th, sponsor check-in will start at <b>8:00 a.m. </b>.
+            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 <b>7:00 p.m. </b>
+            least 15 minutes before opening ceremonies at at <b>10:00 a.m. </b>
+            We also ask you to fill up the sponsor{' '}
+            <LinkDuo to="https://forms.gle/mdsimQyWJG83vYDZ8">
+              <span>check-in form</span>
+            </LinkDuo>.
             <br />
             <br />
-            If part of your package involves speaking at the opening ceremonies,
-            please ensure your video is uploaded to{' '}
-            <LinkDuo to="https://docs.google.com/forms/d/e/1FAIpQLSf32gYN0w8y7aOFmkWu8krKFNJ6xqv6cT3GRXYk-h3PFsYghg/viewform">
-              <span>this form</span>
-            </LinkDuo>
-            . If you are unable to provide a video, please let your coordinator
+            If you are scheduled to speak during the opening ceremony,
+            please email <b>[email protected]</b> with your slides or video. If you are unable to provide a video, please let your coordinator
             know for accommodations.
           </p>
           <h2>Sponsors</h2>
           <p>
-            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:
             <br />
             <br />
-            <b>1. Tabling, Saturday 10:00am-12:00pm:</b> Only applicable to
+            <b>1. Tabling, Saturday 12:00pm-5:00pm:</b> 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!
             <br />
             <br />
-            <b>2. Speed Networking, Saturday 2:00pm-4:00pm:</b> Only applicable
+            <b>2. Speed Networking, Saturday 5:00pm-7:00pm:</b> 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.
             <br />
             <br />
-            Here is an important time we ask mentors to be online:
+            Here is an important time we ask mentors to be available:
             <br />
             <b>Saturday, 10:00am-12:00pm.</b>
             <br />
@@ -127,7 +127,7 @@ const GeneralOnboarding: React.FC = () => (
             <br />
             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 <b>4:00p.m.</b> that is mandatory.
+            Sunday at <b>9:00a.m.</b> or <b>10:30a.m.</b> that is mandatory.
           </p>
           <h2>Workshops {'&'} Mini Events</h2>
           If you are hosting a workshop or mini-event, they will be held
@@ -151,8 +151,8 @@ const GeneralOnboarding: React.FC = () => (
             {'{sponsor}'} channel.
             <br />
             <br />
-            In the event of an emergency, <b>contact</b> the co-directors Agnes
-            (+1 438-969-0186) or Logan (+1 908-328-9155). Please also contact
+            In the event of an emergency, <b>contact</b> the co-directors Jenny
+            (+1 905-621-6698) or Elisa (+1 705-790-8412). Please also contact
             any organizer for immediate assistance.
           </p>
         </Text>

src/features/Onboarding/Onboarding.tsx

@@ -47,15 +47,6 @@ export default class OnboardingContainer extends React.Component< any, any > {
                         >
                             Discord Onboarding
                         </NavLink>
-                        <NavLink>
-                            <a
-                                href="https://mchacks.ca/live/"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                            >
-                                Schedule
-                            </a>
-                        </NavLink>
                     </NavContainer>
                 </Nav>
 
@@ -74,4 +65,4 @@ export default class OnboardingContainer extends React.Component< any, any > {
         )
     }
 
-}
+}

src/pages/Travel/TravelStatusNone.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 
-import { BUS_GENERAL_INFO, BUS_SHOPIFY_PAGE, ITravel } from '../../config';
-import { LinkDuo } from '../../shared/Elements';
+import { ITravel } from '../../config';
 
 interface ITravelStatusProps {
   travel: ITravel;
@@ -14,10 +13,6 @@ const TravelStatusNone: React.FunctionComponent<ITravelStatusProps> = ({
     <div>
       Your request to recieve ${travel.request.toFixed(2)} in reimbursement for
       travel is still being processed.
-      <br />
-      <br />
-      <h2>Bus</h2>
-      {BUS_GENERAL_INFO} <LinkDuo to={BUS_SHOPIFY_PAGE}>here</LinkDuo>.
     </div>
   );
 };

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<ITravelStatusProps> = ({
         </div>
       </div>
     );
-  } else if (travel.request === 0) {
-    return (
-      <div>
-        No reimbursement for travel was requested.
-        <h2>Bus</h2>
-        {BUS_GENERAL_INFO} <LinkDuo to={BUS_SHOPIFY_PAGE}>here</LinkDuo>.
-      </div>
-    );
   } else {
     return (
       <div>
         Unfortunately, we’re unable to offer you any travel reimbursement to
         McHacks.
         <DollarAmount amount={travel.offer} />
-        <h2>Bus</h2>
-        {BUS_GENERAL_INFO} <LinkDuo to={BUS_SHOPIFY_PAGE}>here</LinkDuo>.
       </div>
     );
   }