Update grant form to include nationality and departureCity inputs

Author: estyxx

frontend/src/components/grant-form/index.tsx

@@ -68,6 +68,8 @@ export type GrantFormFields = ParticipantFormFields & {
   why: string;
   notes: string;
   travellingFrom: string;
+  nationality: string;
+  departureCity: string;
   acceptedPrivacyPolicy: boolean;
 };
 
@@ -205,6 +207,8 @@ export const GrantForm = ({
       formState.setField("why", grant.why);
       formState.setField("notes", grant.notes);
       formState.setField("travellingFrom", grant.travellingFrom);
+      formState.setField("nationality", grant.nationality);
+      formState.setField("departureCity", grant.departureCity);
 
       formState.setField("acceptedPrivacyPolicy", true);
     }
@@ -253,6 +257,8 @@ export const GrantForm = ({
         needsFundsForTravel: formState.values.needsFundsForTravel === "true",
         why: formState.values.why,
         travellingFrom: formState.values.travellingFrom,
+        nationality: formState.values.nationality,
+        departureCity: formState.values.departureCity,
         occupation: formState.values.occupation,
         pythonUsage: formState.values.pythonUsage,
         communityContribution: formState.values.communityContribution,
@@ -481,6 +487,37 @@ export const GrantForm = ({
               </Select>
             </InputWrapper>
 
+            <InputWrapper
+              required={true}
+              title={<FormattedMessage id="grants.form.fields.nationality" />}
+              description={
+                <FormattedMessage id="grants.form.fields.nationality.description" />
+              }
+            >
+              <Input
+                {...text("nationality")}
+                required={true}
+                maxLength={100}
+                placeholder={inputPlaceholderText}
+                errors={getErrors("nationality")}
+              />
+            </InputWrapper>
+
+            <InputWrapper
+              required={true}
+              title={<FormattedMessage id="grants.form.fields.departureCity" />}
+              description={
+                <FormattedMessage id="grants.form.fields.departureCity.description" />
+              }
+            >
+              <Input
+                {...text("departureCity")}
+                required={true}
+                maxLength={100}
+                placeholder={inputPlaceholderText}
+                errors={getErrors("departureCity")}
+              />
+            </InputWrapper>
             <InputWrapper
               title={
                 <FormattedMessage id="grants.form.fields.needsFundsForTravel" />

frontend/src/locale/index.ts

@@ -735,9 +735,17 @@ We look forward to reading about you and hope to see you at PyCon Italia 2024!
     "grants.form.fields.grantType.values.diversity": "Diversity",
     "grants.form.fields.grantType.values.unemployed": "Unemployed",
     "grants.form.fields.grantType.values.speaker": "Speaker",
-    "grants.form.fields.travellingFrom": "Where are you travelling from?",
+    "grants.form.fields.travellingFrom":
+      "Which country will you be travelling from?",
     "grants.form.fields.travellingFrom.description":
-      "Please indicate the city and country you will be travelling from to attend the conference.",
+      "Please select the country you will be departing from to attend the conference.",
+    "grants.form.fields.nationality": "What is your nationality?",
+    "grants.form.fields.nationality.description":
+      "Please indicate your nationality.",
+    "grants.form.fields.departureCity":
+      "What city will you be travelling from?",
+    "grants.form.fields.departureCity.description":
+      "Specify the city you will depart from for the conference.",
     "grants.form.fields.needsFundsForTravel":
       "Do you need financial aid for travelling to PyCon Italia?",
     "grants.form.fields.needsFundsForTravel.description":
@@ -1456,9 +1464,14 @@ Non vediamo l'ora di leggere la tua storia e speriamo di vederti a PyCon Italia
     "grants.form.fields.grantType.values.diversity": "Diversity",
     "grants.form.fields.grantType.values.unemployed": "Disoccupato",
     "grants.form.fields.grantType.values.speaker": "Speaker",
-    "grants.form.fields.travellingFrom": "Da dove partirai?",
+    "grants.form.fields.travellingFrom": "Da quale paese partirai?",
     "grants.form.fields.travellingFrom.description":
-      "Indica la città e il paese da cui partirai per partecipare alla conferenza.",
+      "Seleziona il paese da cui partirai per partecipare alla conferenza.",
+    "grants.form.fields.nationality": "Da quale città partirai?",
+    "grants.form.fields.nationality.description": "Indica la tua nazionalità.",
+    "grants.form.fields.departureCity": "Qual è la tua nazionalità?",
+    "grants.form.fields.departureCity.description":
+      "Indica la città da cui inizierai il tuo viaggio.",
     "grants.form.fields.needsFundsForTravel":
       "Hai bisogno di aiuti finanziari per le spese di viaggio a Pycon Italia?",
     "grants.form.fields.needsFundsForTravel.description":

frontend/src/pages/grants/edit/my-grant.graphql

@@ -20,6 +20,8 @@ query MyGrant($conference: String!) {
       why
       notes
       travellingFrom
+      nationality
+      departureCity
     }
   }
 }

frontend/src/pages/grants/edit/update-grant.graphql

@@ -17,6 +17,8 @@ mutation UpdateGrant($input: UpdateGrantInput!) {
       needVisa
       notes
       travellingFrom
+      nationality
+      departureCity
     }
 
     ... on GrantErrors {
@@ -37,6 +39,8 @@ mutation UpdateGrant($input: UpdateGrantInput!) {
         validationWhy: why
         validationNotes: notes
         validationTravellingFrom: travellingFrom
+        validationNationality: nationality
+        validationDepartureCity: departureCity
         validationParticipantBio: participantBio
         validationParticipantWebsite: participantWebsite
         validationParticipantTwitterHandle: participantTwitterHandle