moved mentee sessions to profile

TeamProductionSystem · Sep 17, 2023 · 7dc56f8 · 7dc56f8
1 parent ec5d3d3
commit 7dc56f8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 42 deletions.
diff --git a/src/App.js b/src/App.js
@@ -9,7 +9,6 @@ import Profile from "./pages/Register/Profile";
 import EditProfile from "./pages/Profile/EditProfile";
 import MentorSessions from "./pages/Sessions/MentorSessions";
 import SessionSignup from "./pages/SessionSignup/SessionSignup";
-import MenteeSessions from "./pages/Sessions/MenteeSessions";
 import TimeSlot from "./pages/Profile/TimeSlot";
 import CurrentAvailabilities from "./pages/Profile/Current Availabilities";
 import { Routes, Route } from "react-router-dom";
@@ -149,16 +148,6 @@ function App() {
             />
           }
         />
-        <Route
-          path="/menteesessions"
-          element={
-            <MenteeSessions
-              token={token}
-              setAuth={setAuth}
-              isLoggedIn={isLoggedIn}
-            />
-          }
-        />
         <Route
           path="/sessionsignup"
           element={

diff --git a/src/components/NavBar.js b/src/components/NavBar.js
@@ -1,5 +1,5 @@
 import { Link } from "react-router-dom";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import AppBar from "@mui/material/AppBar";
 import Box from "@mui/material/Box";
 import Toolbar from "@mui/material/Toolbar";
@@ -9,7 +9,6 @@ import IconButton from "@mui/material/IconButton";
 import MenuIcon from "@mui/icons-material/Menu";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
-import axios from "axios";
 import PacmanLoader from "react-spinners/PacmanLoader";
 
 const NavBar = ({ handleLogout, isLoggedIn, token, loading }) => {
@@ -73,15 +72,6 @@ const NavBar = ({ handleLogout, isLoggedIn, token, loading }) => {
                     Mentor Sessions
                   </MenuItem>
                 )}
-                {isMentee && (
-                  <MenuItem
-                    onClick={handleClose}
-                    component={Link}
-                    to="/menteesessions"
-                  >
-                    Mentee Sessions
-                  </MenuItem>
-                )}
                 <MenuItem
                   onClick={handleClose}
                   component={Link}
@@ -93,7 +83,12 @@ const NavBar = ({ handleLogout, isLoggedIn, token, loading }) => {
             </div>
           )}
 
-          <Typography variant="h3" component="div" sx={{ flexGrow: 1 }} data-test="Nav-Title">
+          <Typography
+            variant="h3"
+            component="div"
+            sx={{ flexGrow: 1 }}
+            data-test="Nav-Title"
+          >
             <p className="nav--title">Momentum Mentors</p>
           </Typography>
 
@@ -128,7 +123,7 @@ const NavBar = ({ handleLogout, isLoggedIn, token, loading }) => {
                 </Button>
               </Box>
             ) : (
-              <Link to="/" >
+              <Link to="/">
                 {loading ? (
                   <Button
                     id="loading--button"

diff --git a/src/pages/Profile/ProfileMentee.js b/src/pages/Profile/ProfileMentee.js
@@ -6,6 +6,7 @@ import { Switch } from "@mui/material";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import { styled } from "@mui/material/styles";
 import Survey from "./Survey"
+import MenteeSessions from "../Sessions/MenteeSessions"
 
 export default function ProfileMentee({ token, pk, setAuth }) {
   // first name, last name, phone number
@@ -231,6 +232,7 @@ export default function ProfileMentee({ token, pk, setAuth }) {
             </Grid>
 
           </Grid>
+            <MenteeSessions token={token} pk={pk}/>
         </Box>
       </Box>
       <Survey/>

diff --git a/src/pages/SessionSignup/SessionSignup.js b/src/pages/SessionSignup/SessionSignup.js
@@ -13,7 +13,6 @@ import {
   Select,
   Grid,
   Typography,
-  Container,
 } from "@mui/material";
 
 export default function SessionSignup({ token }) {
@@ -214,7 +213,7 @@ export default function SessionSignup({ token }) {
       )
       .then((response) => {
         console.log("Session created successfully");
-        navigate("/menteesessions");
+        navigate("/profile");
       })
       .catch((error) => {
         console.log("error:", error);

diff --git a/src/pages/Sessions/MenteeCanceled.js b/src/pages/Sessions/MenteeCanceled.js
@@ -23,9 +23,9 @@ export default function MenteeSessions({ token, pk, setAuth }) {
     <Box className="menteecanceled--component">
       {/* filter and add only canceled sessions */}
       <Typography
-        variant="h2"
+        variant="h5"
         component="div"
-        sx={{ flexGrow: 1, marginTop: "4rem", padding: "1rem" }}
+        sx={{ flexGrow: 1, marginTop: "1rem", padding: "1rem" }}
       >
         Canceled:
       </Typography>
@@ -38,7 +38,7 @@ export default function MenteeSessions({ token, pk, setAuth }) {
           sx={{
             flexGrow: 1,
             marginLeft: "1rem",
-            fontSize: "25px",
+            fontSize: "20px",
             textAlign: "center",
           }}
         >
@@ -64,7 +64,7 @@ export default function MenteeSessions({ token, pk, setAuth }) {
                 flexGrow: 1,
                 marginLeft: "1rem",
                 marginTop: "1.75rem",
-                fontSize: "25px",
+                fontSize: "20px",
                 textAlign: "center",
               }}
             >

diff --git a/src/pages/Sessions/MenteeRequest.js b/src/pages/Sessions/MenteeRequest.js
@@ -25,9 +25,9 @@ export default function MenteeSessions({ token, pk, setAuth }) {
     <Box className="menteerequest--component">
       {/* Filter and add only pending sessions */}
       <Typography
-        variant="h2"
+        variant="h5"
         component="div"
-        sx={{ flexGrow: 1, marginTop: "4rem", padding: "1rem" }}
+        sx={{ flexGrow: 1, marginTop: "1rem", padding: "1rem" }}
       >
         Request:
       </Typography>
@@ -40,7 +40,7 @@ export default function MenteeSessions({ token, pk, setAuth }) {
           sx={{
             flexGrow: 1,
             marginLeft: "1rem",
-            fontSize: "25px",
+            fontSize: "20px",
             textAlign: "center",
           }}
         >
@@ -66,7 +66,7 @@ export default function MenteeSessions({ token, pk, setAuth }) {
                 flexGrow: 1,
                 marginLeft: "1rem",
                 marginTop: "1.75rem",
-                fontSize: "25px",
+                fontSize: "20px",
                 textAlign: "center",
               }}
             >

diff --git a/src/pages/Sessions/MenteeScheduled.js b/src/pages/Sessions/MenteeScheduled.js
@@ -25,9 +25,9 @@ export default function MenteeSessions({ token, pk, setAuth }) {
     <Box className="menteescheduled--page">
       {/* Filter and add only confirmed sessions */}
       <Typography
-        variant="h2"
+        variant="h5"
         component="div"
-        sx={{ flexGrow: 1, marginTop: "4rem", padding: "1rem" }}
+        sx={{ flexGrow: 1, marginTop: "1rem", padding: "1rem" }}
       >
         Scheduled:
       </Typography>
@@ -40,7 +40,7 @@ export default function MenteeSessions({ token, pk, setAuth }) {
           sx={{
             flexGrow: 1,
             marginLeft: "1rem",
-            fontSize: "25px",
+            fontSize: "20px",
             textAlign: "center",
           }}
         >
@@ -66,7 +66,7 @@ export default function MenteeSessions({ token, pk, setAuth }) {
                 flexGrow: 1,
                 marginLeft: "1rem",
                 marginTop: "1.75rem",
-                fontSize: "25px",
+                fontSize: "20px",
                 textAlign: "center",
               }}
             >

diff --git a/src/pages/Sessions/MenteeSessions.js → src/pages/Sessions/MenteeSessions.jsx b/src/pages/Sessions/MenteeSessions.js → src/pages/Sessions/MenteeSessions.jsx
@@ -19,13 +19,11 @@ export default function MenteeSessions({ token, pk, setAuth }) {
   return (
     <Box className="menteesessions--page">
       <Typography
-        variant="h2"
+        variant="h4"
         component="div"
         sx={{
-          flexGrow: 1,
-          textAlign: "center",
+          paddingLeft: "1rem",
           marginTop: "2rem",
-          textDecoration: "underline",
         }}
       >
         Mentee Session