@@ -132,7 +147,7 @@ const CreateMealRequest = (): React.ReactElement => {
setDeliveryInstructions={setDeliveryInstructions}
onsiteStaff={onsiteStaff}
setOnsiteStaff={setOnsiteStaff}
- availableStaff={availableStaff}
+ availableStaff={availableOnsiteContacts}
handleBack={() => {}} // Will be assigned by three step form
handleNext={() => {}} // Will be assigned by three step form
/>
diff --git a/frontend/src/components/asp/requests/SchedulingFormReviewAndSubmit.tsx b/frontend/src/components/asp/requests/SchedulingFormReviewAndSubmit.tsx
index 0b9fcfcb..2be4145f 100644
--- a/frontend/src/components/asp/requests/SchedulingFormReviewAndSubmit.tsx
+++ b/frontend/src/components/asp/requests/SchedulingFormReviewAndSubmit.tsx
@@ -27,8 +27,9 @@ import React, { useState } from "react";
import { Value } from "react-multi-date-picker";
import { useNavigate } from "react-router-dom";
-import { DASHBOARD_PAGE } from "../../../constants/Routes";
-import { Contact } from "../../../types/UserTypes";
+import { ASP_DASHBOARD_PAGE } from "../../../constants/Routes";
+import { Contact, OnsiteContact } from "../../../types/UserTypes";
+import { logPossibleGraphQLError } from "../../../utils/GraphQLUtils";
import OnsiteStaffSection from "../../common/OnsiteStaffSection";
// Create the GraphQL mutation
@@ -38,7 +39,7 @@ const CREATE_MEAL_REQUEST = gql`
$numMeals: Int!
$dietaryRestrictions: String
$deliveryInstructions: String
- $onsiteStaff: [ContactInput!]!
+ $onsiteStaff: [String!]!
$scheduledDropOffTime: Time!
$mealRequestDates: [Date!]!
$userId: ID!
@@ -72,7 +73,7 @@ type SchedulingFormReviewAndSubmitProps = {
numMeals: number;
dietaryRestrictions: string;
deliveryInstructions: string;
- onsiteStaff: Contact[];
+ onsiteStaff: OnsiteContact[];
// User ID
userId: string;
@@ -111,7 +112,7 @@ const SchedulingFormReviewAndSubmit: React.FunctionComponent
staff.id),
// Format the scheduled drop off time with the current time zone
scheduledDropOffTime,
userId,
@@ -128,9 +129,10 @@ const SchedulingFormReviewAndSubmit: React.FunctionComponent {
- return (
+const TitleSection = (): React.ReactElement => (
{
);
-};
export default TitleSection;
diff --git a/frontend/src/components/auth/Join.tsx b/frontend/src/components/auth/Join.tsx
index cf2b64fb..4379a2ab 100644
--- a/frontend/src/components/auth/Join.tsx
+++ b/frontend/src/components/auth/Join.tsx
@@ -1,4 +1,4 @@
-import { gql, useMutation } from "@apollo/client";
+import { ApolloError, gql, useMutation } from "@apollo/client";
import {
Button,
Center,
@@ -15,12 +15,13 @@ import {
Textarea,
useToast,
} from "@chakra-ui/react";
+import { GraphQLError } from "graphql";
import React, { useContext, useState } from "react";
import { Navigate, useNavigate } from "react-router-dom";
import LargerBackgroundImage from "../../assets/largerbackground.png";
import {
- DASHBOARD_PAGE,
+ ASP_DASHBOARD_PAGE,
HOME_PAGE,
JOIN_SUCCESS_PAGE,
} from "../../constants/Routes";
@@ -31,6 +32,7 @@ import {
Role,
UserInfo,
} from "../../types/UserTypes";
+import { logPossibleGraphQLError } from "../../utils/GraphQLUtils";
import {
isNonNegativeInt,
isValidEmail,
@@ -81,11 +83,6 @@ const SIGNUP = gql`
phone
email
}
- onsiteContacts {
- name
- phone
- email
- }
}
dateSubmitted
status
@@ -124,370 +121,348 @@ const Join = (): React.ReactElement => {
const { authenticatedUser } = useContext(AuthContext);
if (authenticatedUser) {
- return ;
+ return ;
}
- const getTitleSection = (): React.ReactElement => {
- return (
- <>
- (
+ <>
+
+ Sign Up
+
+
+ Already have an account?{" "}
+
+ Login here
+
+
+
+ );
+
+ const getUserTypeSection = (): React.ReactElement => (
+
+
+
- Sign Up
-
-
+ setRole(radioVal as Role)}
+ value={role}
>
- Already have an account?{" "}
-
- Login here
-
-
-
- );
- };
-
- const getUserTypeSection = (): React.ReactElement => {
- return (
-
-
-
- Type of user
-
- setRole(radioVal as Role)}
- value={role}
- >
-
-
- After School Program
-
-
- Meal Donor
-
-
-
-
-
- );
- };
+
+
+ After School Program
+
+
+ Meal Donor
+
+
+
+
+
+ );
- const getEmailSection = (): React.ReactElement => {
- return (
-
- (
+
+
+
-
- Email address
-
- setEmail(e.target.value)}
- placeholder={
- isWebView
- ? PLACEHOLDER_WEB_EXAMPLE_EMAIL
- : PLACEHOLDER_MOBILE_EXAMPLE_EMAIL
- }
- />
-
-
- );
- };
+ Email address
+
+ setEmail(e.target.value)}
+ placeholder={
+ isWebView
+ ? PLACEHOLDER_WEB_EXAMPLE_EMAIL
+ : PLACEHOLDER_MOBILE_EXAMPLE_EMAIL
+ }
+ />
+
+
+ );
- const getWebOrganizationSection = (): React.ReactElement => {
- return (
- <>
- Organization Information
-
-
-
-
- Name of organization
-
- setOrganizationName(e.target.value)}
- />
-
-
- {role === "ASP" && (
-
-
-
- Number of kids
-
- setNumKids(e.target.value)}
- />
-
-
- )}
- (
+ <>
+ Organization Information
+
+
+
+
+ Name of organization
+
+ setOrganizationName(e.target.value)}
+ />
+
+
+ {role === "ASP" && (
+
- Address of organization
+ Number of kids
setOrganizationAddress(e.target.value)}
+ type="number"
+ value={numKids}
+ placeholder={PLACEHOLDER_WEB_EXAMPLE_NUM_KIDS}
+ onChange={(e) => setNumKids(e.target.value)}
/>
-
-
+ )}
+
- Description of organization
+ Address of organization
-