diff --git a/src/scenes/Dashboard/scenes/ManageMentees/index.tsx b/src/scenes/Dashboard/scenes/ManageMentees/index.tsx index d038c89..90668c7 100644 --- a/src/scenes/Dashboard/scenes/ManageMentees/index.tsx +++ b/src/scenes/Dashboard/scenes/ManageMentees/index.tsx @@ -16,6 +16,7 @@ import { useParams } from 'react-router'; import { API_URL } from '../../../../constants'; import { Mentee } from '../../../../types'; import styles from '../../styles.css'; +import StatusTag from '../ManageMentors/components/StatusTag'; const { Title } = Typography; const { confirm } = Modal; @@ -112,10 +113,14 @@ function ManageMentees() { } description={item.profile.headline} /> - + + {item.profile.email} + + Mentor: {item.mentor.profile.firstName}{' '} {item.mentor.profile.lastName} + )} /> diff --git a/src/scenes/Dashboard/scenes/ManageMentors/components/MentorRow/index.tsx b/src/scenes/Dashboard/scenes/ManageMentors/components/MentorRow/index.tsx index d215159..d55d307 100644 --- a/src/scenes/Dashboard/scenes/ManageMentors/components/MentorRow/index.tsx +++ b/src/scenes/Dashboard/scenes/ManageMentors/components/MentorRow/index.tsx @@ -206,6 +206,7 @@ function MentorRow({ mentor, programState }: Props) { } description={mentor.profile.headline} /> + {mentor.profile.email} - {isRejected ? ( - Rejected - ) : ( + {isRejected ? Rejected : null} + {state !== 'MENTEE_APPLICATION' && !isRejected ? ( - )} + ) : null} {program.headline} diff --git a/src/scenes/Home/components/MentorPrograms/components/MentorProgramCard/interfaces.ts b/src/scenes/Home/components/MentorPrograms/components/MentorProgramCard/interfaces.ts index 37e5154..f435879 100644 --- a/src/scenes/Home/components/MentorPrograms/components/MentorProgramCard/interfaces.ts +++ b/src/scenes/Home/components/MentorPrograms/components/MentorProgramCard/interfaces.ts @@ -5,4 +5,13 @@ export interface MentorProgramCardProps { href?: string; buttonText?: string; isRejected: boolean; + state: + | 'CREATED' + | 'MENTOR_APPLICATION' + | 'MENTOR_SELECTION' + | 'MENTEE_APPLICATION' + | 'MENTEE_SELECTION' + | 'MENTOR_CONFIRMATION' + | 'ONGOING' + | 'COMPLETED'; } diff --git a/src/scenes/Home/components/MentorPrograms/index.tsx b/src/scenes/Home/components/MentorPrograms/index.tsx index 8eacbe6..9686c50 100644 --- a/src/scenes/Home/components/MentorPrograms/index.tsx +++ b/src/scenes/Home/components/MentorPrograms/index.tsx @@ -150,6 +150,7 @@ function MentorPrograms() { href={`/program/${program.id}/mentor/edit`} buttonText={'Edit Application'} isRejected={false} + state={program.state} /> ))} {approvedMentorPrograms.map((program: SavedProgram) => ( @@ -159,6 +160,7 @@ function MentorPrograms() { href={`/mentor/program/${program.id}`} buttonText={'Manage'} isRejected={false} + state={program.state} /> ))} {rejectedMentorPrograms.map((program: SavedProgram) => ( @@ -166,6 +168,7 @@ function MentorPrograms() { key={program.id} program={program} isRejected={true} + state={program.state} /> ))} diff --git a/src/scenes/Home/scenes/ManageMentees/components/MenteeRow/index.tsx b/src/scenes/Home/scenes/ManageMentees/components/MenteeRow/index.tsx index 9dc8cb8..72d30be 100644 --- a/src/scenes/Home/scenes/ManageMentees/components/MenteeRow/index.tsx +++ b/src/scenes/Home/scenes/ManageMentees/components/MenteeRow/index.tsx @@ -136,6 +136,7 @@ function MenteeRow({ mentee, programState }: StatusTagProps) { } description={mentee.profile.headline} /> + {mentee.profile.email} ); }