diff --git a/package-lock.json b/package-lock.json index 7e93a34..351ae48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "react-dom": "^17.0.0 || ^yarn18.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/src/app/team/components/AllTeams.jsx b/src/app/team/components/AllTeams.jsx index aa2512c..865bfb8 100644 --- a/src/app/team/components/AllTeams.jsx +++ b/src/app/team/components/AllTeams.jsx @@ -8,7 +8,7 @@ import { useResponsive } from "../../../hooks/useResponsive"; export default function AllTeam() { const [member, setMember] = useState([]); - const { isTablet } = useResponsive(); + const { isTablet, fontSize, fontWeight } = useResponsive(); useEffect(() => { const getTeam = async () => { @@ -19,10 +19,19 @@ export default function AllTeam() { getTeam(); }, []); + console.log("fontSize", fontSize); + return ( - + Team Enigma diff --git a/src/app/team/components/MemberCard.jsx b/src/app/team/components/MemberCard.jsx index c680b21..4ac899b 100644 --- a/src/app/team/components/MemberCard.jsx +++ b/src/app/team/components/MemberCard.jsx @@ -11,6 +11,9 @@ import LanguageIcon from "@mui/icons-material/Language"; import AndroidIcon from "@mui/icons-material/Android"; import SmartToyIcon from "@mui/icons-material/SmartToy"; import OpenInNewIcon from "@mui/icons-material/OpenInNew"; +import style from "../team.module.css"; +import Link from '@mui/material/Link'; +import { useResponsive } from "../../../hooks/useResponsive"; export default function MemberCard({ memberImage, memberName, memberUsername }) { const profileRedirect = () => { @@ -18,106 +21,133 @@ export default function MemberCard({ memberImage, memberName, memberUsername }) window.open(newPageUrl, "_blank"); }; + const {isTablet} = useResponsive(); + return ( - - - 🎯 - - - + <> + { + isTablet ? ( + +
+ + + {memberName} + +
+
+ ):( + + 🎯 + + - - - + + - - {memberName} - Code and coffee is life! - - - - - - - - - - - + + + + {memberName} + Code and coffee is life! + + + + + + + + + + + + + + - - - +
+ ) + } + + ); } diff --git a/src/app/team/components/SideTab.jsx b/src/app/team/components/SideTab.jsx index 963960a..ebf2b02 100644 --- a/src/app/team/components/SideTab.jsx +++ b/src/app/team/components/SideTab.jsx @@ -67,7 +67,7 @@ export default function SideTab() { { const isLaptop = useMediaQuery("(max-width:900px)"); const isTablet = useMediaQuery("(max-width:650px)"); - const isMobile = useMediaQuery("(max-width:600px)"); + const isMobile = useMediaQuery("(max-width:500px)"); + + let fontSize, lineHeight, fontWeight; + + useEffect(() => { + window.addEventListener("resize", ()=>{}); + return () => { + window.removeEventListener("resize", ()=>{}); + } + },[]); + + + fontSize = isMobile ? "1.4rem" : isTablet ? "2rem" : "2.5rem"; + lineHeight = isMobile ? "1.1rem" : isTablet ? "1.3rem" : "1.5rem"; + fontWeight = isMobile ? "200" : isTablet ? "300" : "400"; return { isLaptop, isTablet, isMobile, + fontSize, + lineHeight, + fontWeight, }; }; diff --git a/src/ui/Header.jsx b/src/ui/Header.jsx index 8b4a2eb..546ea0c 100644 --- a/src/ui/Header.jsx +++ b/src/ui/Header.jsx @@ -17,7 +17,7 @@ const DrawerList = ({ activeLink }) => ( direction="column" gap="25px" padding="20px" - width="230px" + width="210px" alignItems="flex-start" height={1} position={"relative"} @@ -46,7 +46,7 @@ const DrawerList = ({ activeLink }) => ( />