Merge pull request #252 from cmu15122/jtromero/preferredNameFixes

Preferred Name Fixes
cmu15122 · Jan 10, 2024 · b39f1d0 · b39f1d0
2 parents 35cb11a + c1bd90f
commit b39f1d0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/client/src/components/navbar/ChangeNameBtn.tsx b/client/src/components/navbar/ChangeNameBtn.tsx
@@ -1,13 +1,13 @@
 import React, {useState} from 'react';
 import {
-  Button, Dialog, DialogActions, DialogTitle, DialogContent, DialogContentText, TextField,
+  Button, Dialog, DialogActions, DialogTitle, DialogContent, DialogContentText, TextField, Typography, MenuItem,
 } from '@mui/material';
 import EditIcon from '@mui/icons-material/Edit';
 
 import SettingsService from '../../services/SettingsService';
 
 export default function ChangeNameBtn(props) {
-  const {setpname, pname} = props;
+  const {setpname, pname, mobile} = props;
 
   const [tmpPrefName, setTmpPrefName] = useState(pname);
   const [open, setOpen] = useState(false);
@@ -28,9 +28,15 @@ export default function ChangeNameBtn(props) {
 
   return (
     <div>
-      <Button variant="text" onClick={handleClickOpen} sx={{color: '#FFFFFF'}}>
-        <EditIcon/>
-      </Button>
+      {
+        mobile ?
+          <MenuItem onClick={handleClickOpen}>
+            <Typography variant='subtitle2' sx={{mx: 2}}> Change Name </Typography>
+          </MenuItem> :
+          <Button variant="text" onClick={handleClickOpen} sx={{color: '#FFFFFF'}}>
+            <EditIcon/>
+          </Button>
+      }
       <Dialog open={open} onClose={handleClose}>
         <form onSubmit={handleSubmit}>
           <DialogTitle>Change Name</DialogTitle>

diff --git a/client/src/components/navbar/Navbar.tsx b/client/src/components/navbar/Navbar.tsx
@@ -156,6 +156,9 @@ export default function Navbar(props) {
                     </MenuItem>
                   ))
                 }
+                {
+                  userData.isAuthenticated && <ChangeNameBtn mobile={true} pname={pname} setpname={setpname}/>
+                }
                 {
                   userData.isAuthenticated &&
                     <MenuItem onClick={handleLogoutClicked}>
@@ -199,7 +202,7 @@ export default function Navbar(props) {
         </Box>
         <Box sx={{flexGrow: 0, display: 'flex'}}>
           {
-            userData.isAuthenticated && <ChangeNameBtn pname={pname} setpname={setpname}/>
+            userData.isAuthenticated && <ChangeNameBtn mobile={false} pname={pname} setpname={setpname}/>
           }
         </Box>
 

diff --git a/server/controllers/settings.js b/server/controllers/settings.js
@@ -42,7 +42,7 @@ function respond(req, res, message, data, status) {
 }
 
 function respond_success(req, res, message = null) {
-    if (!req.user || !req.user.isTA) {
+    if (!req.user) {
         respond_error(req, res, "You don't have permissions to view this page", 404);
         return;
     }