WIP: fix login and fix user image

Signed-off-by: Vallari Agrawal <[email protected]>
ceph · Sep 13, 2024 · ae9008e · ae9008e
1 parent 6e2c080
commit ae9008e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/components/Login/index.jsx b/src/components/Login/index.jsx
@@ -5,22 +5,23 @@ import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import GitHubIcon from '@mui/icons-material/GitHub';
 
-import { doLogin, doLogout, useSession, useUserData } from "../../lib/teuthologyAPI";
+import { doLogin, doLogout, useSession, getUserData } from "../../lib/teuthologyAPI";
 
 
 export default function Login() {
   const sessionQuery = useSession();
-  const userData = useUserData();
-  const [anchorEl, setAnchorEl] = useState(null);
-  const open = Boolean(anchorEl);
+  const userData = getUserData();
+  const [dropMenuAnchor, setDropMenuAnchor] = useState(null);
+  const open = Boolean(dropMenuAnchor);
   const handleClick = (event) => {
-    setAnchorEl(event.currentTarget);
+    setDropMenuAnchor(event.currentTarget);
   };
   const handleClose = () => {
-    setAnchorEl(null);
+    setDropMenuAnchor(null);
   };
 
   if ( ! sessionQuery.isSuccess ) return null;
+  console.log(userData);
 
   return (
     <div>
@@ -30,23 +31,18 @@ export default function Login() {
               alt={userData.get("username") || ""} 
               src={userData.get("avatar_url") || ""}
               onClick={handleClick} 
-              aria-controls={open ? 'basic-menu' : undefined} 
-              aria-expanded={open ? 'true' : undefined} 
             />
             <Menu
-              id="basic-menu"
-              anchorEl={anchorEl}
+              anchorEl={dropMenuAnchor}
               open={open}
               onClose={handleClose}
-              MenuListProps={{
-                'aria-labelledby': 'basic-button',
-              }}
             >
               <MenuItem onClick={doLogout}>Logout</MenuItem>
             </Menu>
         </div>
         : <Button 
             variant="contained" 
+            color="success"
             onClick={doLogin}
             startIcon={<GitHubIcon fontSize="small" /> }
             disabled={sessionQuery.isError}

diff --git a/src/lib/teuthologyAPI.ts b/src/lib/teuthologyAPI.ts
@@ -41,7 +41,7 @@ function useSession(): UseQueryResult<Session> {
     return query;
 }
 
-function useUserData(): Map<string, string> {
+function getUserData(): Map<string, string> {
     const cookies = new Cookies();
     const cookie = cookies.get(GH_USER_COOKIE);
     if (cookie) {
@@ -75,6 +75,6 @@ export {
     doLogin,
     doLogout,
     useSession,
-    useUserData,
+    getUserData,
     useRunKill,
 }