From d2f753d9efced9d80f1f4930ac12233c75a88a02 Mon Sep 17 00:00:00 2001 From: xiaoxu Date: Mon, 22 Jul 2024 02:42:02 +0800 Subject: [PATCH] fix: mobile UserAvatar --- .../MainNav/Hamberger/MenuList.jsx | 41 ++++--------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/shared/components/Navigation_v2/MainNav/Hamberger/MenuList.jsx b/shared/components/Navigation_v2/MainNav/Hamberger/MenuList.jsx index d64a90bd..add3b866 100644 --- a/shared/components/Navigation_v2/MainNav/Hamberger/MenuList.jsx +++ b/shared/components/Navigation_v2/MainNav/Hamberger/MenuList.jsx @@ -3,8 +3,8 @@ import styled from '@emotion/styled'; import { Box } from '@mui/material'; import { useRouter } from 'next/router'; import MenuItem from './MenuItem'; -import UserAvatar from './UserAvatar'; -import useFirebase from '../../../../../hooks/useFirebase'; +import UserAvatar from '../SubList/UserAvatar'; +import { useSelector } from 'react-redux'; const MenuWrapper = styled.div` position: fixed; @@ -31,42 +31,15 @@ const MenuListWrapper = styled.div` const Menu = ({ open, list, onCloseMenu }) => { const router = useRouter(); - const { - auth, - user, - signInWithFacebook, - signOutWithFacebook, - signOutWithGoogle, - } = useFirebase(); + + + const user = useSelector((state) => state.user); + console.log("MenuList", user); return ( {open && ( - {user && } - {user ? ( - { - // signOutWithFacebook(); - onCloseMenu(); - signOutWithGoogle(); - router.push('/'); - }} - text="登出" - /> - ) : ( - { - router.push('/login'); - // signInWithFacebook(); - }} - text="登入" - /> - )} - + {list.map((value, index) => { return (