Merge pull request #219 from sef-global/development

Release ScholarX v1.2.4

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}
               />
-              <span>
+              <span className={styles.mentorNameSpan}>
+                {item.profile.email}
+              </span>
+              <span className={styles.mentorNameSpan}>
                 Mentor: {item.mentor.profile.firstName}{' '}
                 {item.mentor.profile.lastName}
               </span>
+              <StatusTag state={item.state} />
             </List.Item>
           )}
         />

src/scenes/Dashboard/scenes/ManageMentors/components/MentorRow/index.tsx

@@ -206,6 +206,7 @@ function MentorRow({ mentor, programState }: Props) {
           }
           description={mentor.profile.headline}
         />
+        <span className={styles.mentorNameSpan}>{mentor.profile.email}</span>
       </List.Item>
       <Drawer
         width={640}

src/scenes/Dashboard/styles.css

@@ -43,3 +43,7 @@
     padding-right: 40px;
 }
 
+.mentorNameSpan{
+    padding-right: 2rem;
+}
+

src/scenes/Home/components/MentorPrograms/components/MentorProgramCard/index.tsx

@@ -10,6 +10,7 @@ const { Paragraph, Title, Text } = Typography;
 function MentorProgramCard({
   program,
   buttonText,
+  state,
   isRejected,
   href,
 }: MentorProgramCardProps) {
@@ -39,13 +40,12 @@ function MentorProgramCard({
             </Title>
           </Col>
           <Col span={11} className={styles.programActionButton}>
-            {isRejected ? (
-              <Text type={'danger'}>Rejected</Text>
-            ) : (
+            {isRejected ? <Text type={'danger'}>Rejected</Text> : null}
+            {state !== 'MENTEE_APPLICATION' && !isRejected ? (
               <Button type="primary" href={href}>
                 {buttonText}
               </Button>
-            )}
+            ) : null}
           </Col>
         </Row>
         <Paragraph>{program.headline}</Paragraph>

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';
 }

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,13 +160,15 @@ function MentorPrograms() {
               href={`/mentor/program/${program.id}`}
               buttonText={'Manage'}
               isRejected={false}
+              state={program.state}
             />
           ))}
           {rejectedMentorPrograms.map((program: SavedProgram) => (
             <MentorProgramCard
               key={program.id}
               program={program}
               isRejected={true}
+              state={program.state}
             />
           ))}
         </Row>

src/scenes/Home/scenes/ManageMentees/components/MenteeRow/index.tsx

@@ -136,6 +136,7 @@ function MenteeRow({ mentee, programState }: StatusTagProps) {
         }
         description={mentee.profile.headline}
       />
+      <span>{mentee.profile.email}</span>
     </List.Item>
   );
 }