Update transportation flow for 2025

Author: connorff

backend/__mocks__/constants.ts

@@ -29,6 +29,7 @@ export var TYPE = {
 export var TRANSPORTATION_TYPE = {
   BUS: "bus",
   FLIGHT: "flight",
+  TRAIN: "train",
   OTHER: "other",
 };
 

backend/constants.ts

@@ -30,6 +30,7 @@ export var TYPE = {
 export var TRANSPORTATION_TYPE = {
   BUS: "bus",
   FLIGHT: "flight",
+  TRAIN: "train",
   OTHER: "other",
 };
 

backend/routes/transportation_info.ts

@@ -36,8 +36,8 @@ export function submitTransportationInfo(req: Request, res: Response) {
             if (new Date(e.admin_info.transportation.deadline) < new Date()) {
                 return res.status(403).send("Transportation deadline has passed.");
             }
-            if (e.admin_info.transportation.type !== TRANSPORTATION_TYPE.FLIGHT && e.admin_info.transportation.type !== TRANSPORTATION_TYPE.OTHER) {
-                return res.status(403).send("Transportation type is not FLIGHT or OTHER.");
+            if (e.admin_info.transportation.type !== TRANSPORTATION_TYPE.FLIGHT && e.admin_info.transportation.type !== TRANSPORTATION_TYPE.TRAIN && e.admin_info.transportation.type !== TRANSPORTATION_TYPE.OTHER) {
+                return res.status(403).send("Transportation type is not FLIGHT or TRAIN or OTHER.");
             }
             // todo: share this with the frontend in some common configuration.
             const requiredFields = {

backend/routes/user_bulk_change.ts

@@ -25,6 +25,7 @@ export function bulkChangeUsers(req: Request, res: Response) {
             switch (element.transportationType) {
                 case TRANSPORTATION_TYPE.BUS:
                 case TRANSPORTATION_TYPE.FLIGHT:
+                case TRANSPORTATION_TYPE.TRAIN:
                 case TRANSPORTATION_TYPE.OTHER:
                     break;
                 case "":

src/Dashboard/AdmittedScreen.tsx

@@ -10,27 +10,27 @@ interface IAdmittedScreenProps {
   declineAdmission: () => void;
   confirmedYet: boolean;
   deadline: string;
+  stanford?: boolean;
 }
 export const AdmittedScreen = (props: IAdmittedScreenProps) => (
   <div className="admitted-content">
     {props.confirmedYet && (
       <div>
-        <h4>Complete the following by <strong>January 21st:</strong></h4>
+        <h4>Complete the following by <strong>January 1st:</strong></h4>
         <ul style={{ textAlign: "left", margin: "20px auto", maxWidth: 575 }}>
-          <li>Follow the steps in <Link to="/transportation">travel section</Link> <strong>as early as possible!</strong> </li>
-          <li>Fill out the quick <a href="https://forms.gle/v44CrmU426cfhxwh6">Travel Acknowledgement Form</a></li>
-          <li><a href="https://forms.gle/YwPqv684XYq3f4RZ7">Register for GrantEd</a> (this is required in order to receive a prize or a travel reimbursement)</li>
-          <li>Complete the <a href="https://docs.google.com/forms/d/e/1FAIpQLSd5JHPbFsLVz4pKt6YtJuZdISozgmnTrRdRFKvI_AhPQE_mow/viewform">liability form </a></li>
+          {!props.stanford && <li>Follow the steps in <Link to="/transportation">travel section</Link> <strong>as early as possible!</strong> </li>}
+          <li>Fill out the quick <a href="https://forms.gle/NdxcXZWqmW5erSA27">Acceptance and Travel Acknowledgement Form</a></li>
         </ul>
         <p>
           Keep an eye on your inbox in the coming weeks -- we'll be sending more
           details to you shortly!
         </p>
-        <button className="btn btn-custom">
+        {/* Commenting out until updated */}
+        {/* <button className="btn btn-custom">
           <a href="https://docs.google.com/document/d/162lC3yzvkURS1FZcVX-vpMckuWYkbqnoESZcPdxRdHk/edit?usp=sharing" style={{ color: "white" }}>
             Ultimate TreeHacks Guide
           </a>
-        </button>
+        </button> */}
       </div>
     )}
     {!props.confirmedYet && (

src/Dashboard/Dashboard.tsx

@@ -97,7 +97,7 @@ export const Dashboard = (props: IDashboardProps) => {
           ) : props.profile.status === STATUS.WAITLISTED ? (
             <WaitlistedScreen />
           ) : (props.profile.status === STATUS.ADMISSION_CONFIRMED && props.profile.type === TYPE.STANFORD) ? (
-            <AdmittedStanford confirmedYet={true} />
+            <AdmittedScreen confirmedYet={true} stanford={true} />
           ): props.profile.status === STATUS.ADMISSION_CONFIRMED ? (
             <AdmittedScreen confirmedYet={true} />
           ) : props.profile.status === STATUS.ADMISSION_DECLINED ? (

src/Transportation/FlightReimbursementHeader.tsx

@@ -1,73 +1,8 @@
 import React from "react";
 import { HACKATHON_YEAR } from "../constants";
-import { Link } from "react-router-dom";
 
 export default () => (
   <div>
-    <p style={{ maxWidth: 575, margin: "20px auto" }}>
-      We have calculated your flight cap based on the location in your application, and above is the amount up to which we can reimburse the cost of your flight.<strong> If you do not book your flight through Egencia (details below) by the deadline, we will assume you are declining the reimbursement, and you will not be reimbursed. </strong>See the detailed steps below that walk you through booking a flight using Egencia! This should take about 15-20 minutes and must be completed by the deadline above. 
-    </p>
-    <button className="btn btn-custom">
-      <a href="https://www.egencia.com/pub/agent.dll?qscr=mtgd&mgid=84861&miid=87A6AC6D9057&gpid=9AE927F23FE9" style={{ color: "white" }}>
-        Egencia
-      </a>
-    </button>
-    <ul style={{ textAlign: "left", margin: "20px auto", maxWidth: 575 }}>
-        <li> Create an account on Egencia
-            <ul>
-                <li>Select “Create an account for TreeHacks 2025”.</li>
-                <li>Your name must match your government ID exactly.</li>
-                <li>For Egencia user name, use the email address you applied to TreeHacks with.</li>
-                <li>Select “Use password sign-in”.</li>
-                <li>For SUNet ID, put “N/A”.</li>
-                <li>For email, use the email address you applied to TreeHacks with.</li>
-                <li>For Affiliation, put “Guest”.</li>
-                <li>For Employee ID, put “0”.</li>
-                <li>For Budget Unit, select “University General”.</li>
-                <li>Click “Submit user account request”.</li>
-                <li>You will then receive an email to create your password.</li>
-            </ul>
-        </li>
-        <li>
-            Book flight through Egencia
-            <ul>
-                <li>On your profile, select “Add a flight”.</li>
-                <li>The name of your traveler must match your government ID exactly.</li>
-                <li>Fly into SFO or SJC.</li>
-                <li>Be sure to book a flight that will let you arrive at Stanford campus BEFORE 5:30pm on Friday, Feb 16.</li>
-                <li>Be sure to book a flight that will let you leave campus no earlier than 2:30pm on Sunday, Feb 18.</li>
-                <li>Leaving earlier than 2:30pm may mean you will not be able to receive your prize.</li>
-                <li>Upon checkout:</li>
-                <ul>
-                    <li>Use your own credit card to pay for your flight. If you meet all reimbursement criteria, you will be reimbursed after the event.</li>
-                    <li>Select “No” when responding to the ‘Is this trip Federally Funded?’ question.</li>
-                    <li>Select “Business” when responding to the ‘Business or Personal Travel’ question.</li>
-                    <li>Include “Test Event” in the ‘Expense Notes’ field.</li>
-                    <li>Read the flight reimbursement criteria below.</li>
-                </ul>
-            </ul>
-        </li>
-    </ul>
-    <p style={{ textAlign: "left", margin: "20px auto", maxWidth: 575 }}>
-      Your reimbursement will be rejected if you don't:
-    </p>
-    <ul style={{ textAlign: "left", margin: "20px auto", maxWidth: 575 }}>
-      <li>Check-in at the event in person</li>
-      <li>Submit a qualified project to the Devpost before hacking closes. A qualified project is one where: </li>
-      <ul>
-        <li>it is clear that thought and effort went into the project</li>
-        <li>it contains original code and is not a fork/clone of an existing repo</li>
-        <li>it adheres to the rules of the hackathon, which require all coding to be done during the 36 hours</li>
-      </ul>
-      <li>
-        Follow any and all TreeHacks rules &amp; the{" "}
-        <a
-          target="_blank"
-          href="https://github.com/TreeHacks/policies/blob/master/code-of-conduct.md"
-        >
-          TreeHacks Code of Conduct.
-        </a>
-      </li>
-    </ul>
+    Please read and complete the <a href="https://docs.google.com/document/d/1QVkvW3RKHdBwrWalww8Q3QGB-ukNai_m7BX0iqfzFGQ/edit?usp=sharing">TreeHacks {HACKATHON_YEAR} Travel Reimbursement Instructions</a>
   </div>
 );

src/Transportation/Transportation.tsx

@@ -109,6 +109,7 @@ export class Transportation extends React.Component<ITransportationProps> {
     const dateNow = moment();
     const deadlinePassed = dateNow > transportationDeadline;
     let transportationForm = this.props.formData || {};
+
     if (status !== STATUS.ADMITTED && status !== STATUS.ADMISSION_CONFIRMED) {
       // No travel info to show
       return (
@@ -140,7 +141,7 @@ export class Transportation extends React.Component<ITransportationProps> {
         </div>
       );
     }
-    if (transportation_status === TRANSPORTATION_STATUS.UNAVAILABLE) {
+    if (transportation_status === TRANSPORTATION_STATUS.UNAVAILABLE || transportationType === TRANSPORTATION_TYPES.OTHER) {
       return (
         <div
           style={{
@@ -289,7 +290,7 @@ export class Transportation extends React.Component<ITransportationProps> {
 
     if (
       transportationType === TRANSPORTATION_TYPES.FLIGHT ||
-      transportationType === TRANSPORTATION_TYPES.OTHER
+      transportationType === TRANSPORTATION_TYPES.TRAIN
     ) {
       if (
         dateNow > transportationDeadline &&
@@ -308,8 +309,6 @@ export class Transportation extends React.Component<ITransportationProps> {
           }}
         >
           <div className="treehacks-alert">
-            {transportationType === TRANSPORTATION_TYPES.FLIGHT && (
-          <>
             <h5>
               TreeHacks is reimbursing you up to{" "}
               <span className="treehacks-transportation-amount-text">
@@ -318,11 +317,10 @@ export class Transportation extends React.Component<ITransportationProps> {
                   currency: "USD",
                 })}
               </span>
+              {" "}for your{" "}
+              {transportationType === TRANSPORTATION_TYPES.TRAIN ? "train" : "flight"}
             </h5>
             <FlightReimbursementHeader />
-          </>
-            )}
-            )}
           </div>
         </div>
       );

src/constants.ts

@@ -44,6 +44,7 @@ export var TRANSPORTATION_STATUS = {
 export var TRANSPORTATION_TYPES = {
   BUS: "bus",
   FLIGHT: "flight",
+  TRAIN: "train",
   OTHER: "other",
 };