Merge pull request #174 from sef-global/development

Release ScholarX v1.2.1
sef-global · Jun 6, 2021 · 844c9a3 · 844c9a3
2 parents 8fab792 + 6bbe334
commit 844c9a3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/public/index.html b/public/index.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="shortcut icon" href="dist/favicon.png">
+  <link rel="shortcut icon" href="/favicon.png">
   <title>ScholarX | Sustainable Education Foundation</title>
 </head>
 
@@ -13,7 +13,6 @@
   <noscript>
     You need to enable JavaScript to run this app.
   </noscript>
-  <script src="/dist/bundle.js"></script>
 </body>
 
 </html>

diff --git 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}
               />
+              <span>
+                Mentor: {item.mentor.profile.firstName}{' '}
+                {item.mentor.profile.lastName}
+              </span>
             </List.Item>
           )}
         />

diff --git 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;
 }
diff --git 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: {