From 9be5e1110bb78e58438ad4f41a29292ae142326a Mon Sep 17 00:00:00 2001 From: Kumuditha Karunarathna Date: Sun, 6 Jun 2021 20:13:27 +0530 Subject: [PATCH 1/2] Show which mentor the mentee belongs to in Admin Dashboard - Manage Mentee (#171) --- src/scenes/Dashboard/scenes/ManageMentees/index.tsx | 4 ++++ src/scenes/Dashboard/scenes/ManageMentees/interfaces.tsx | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/scenes/Dashboard/scenes/ManageMentees/index.tsx b/src/scenes/Dashboard/scenes/ManageMentees/index.tsx index fcce081..f6fc680 100644 --- a/src/scenes/Dashboard/scenes/ManageMentees/index.tsx +++ b/src/scenes/Dashboard/scenes/ManageMentees/index.tsx @@ -110,6 +110,10 @@ function ManageMentees() { } description={item.profile.headline} /> + + Mentor: {item.mentor.profile.firstName}{' '} + {item.mentor.profile.lastName} + )} /> diff --git a/src/scenes/Dashboard/scenes/ManageMentees/interfaces.tsx b/src/scenes/Dashboard/scenes/ManageMentees/interfaces.tsx index 7607e54..f7cb49f 100644 --- a/src/scenes/Dashboard/scenes/ManageMentees/interfaces.tsx +++ b/src/scenes/Dashboard/scenes/ManageMentees/interfaces.tsx @@ -1,8 +1,9 @@ -import { Profile } from '../../../../interfaces'; +import { Profile, Mentor } from '../../../../interfaces'; export interface Mentee { id: number; profile: Profile; state: string; submissionUrl: string; + mentor: Mentor; } From 6bbe334701752406c1c4c4c46aceb64c8939c843 Mon Sep 17 00:00:00 2001 From: Anjula Shanaka Date: Sun, 6 Jun 2021 21:35:59 +0530 Subject: [PATCH 2/2] Update the webpack configuration (#173) --- public/index.html | 3 +-- webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/index.html b/public/index.html index 22fd511..e8c9c99 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,7 @@ - + ScholarX | Sustainable Education Foundation @@ -13,7 +13,6 @@ - diff --git a/webpack.config.js b/webpack.config.js index c9dd3b3..8d8fd7b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -49,7 +49,7 @@ module.exports = { resolve: { extensions: ['*', '.js', '.jsx', '.ts', '.tsx'] }, output: { path: path.resolve(__dirname, 'dist/'), - publicPath: '/dist/', + publicPath: '/', filename: 'bundle.js', }, devServer: {