diff --git a/apps/live/src/app/lib/Components/FilterButton.tsx b/apps/live/src/app/lib/Components/FilterButton.tsx new file mode 100644 index 00000000..8dcdfb9b --- /dev/null +++ b/apps/live/src/app/lib/Components/FilterButton.tsx @@ -0,0 +1,57 @@ +import React, {useState} from 'react'; +import useIsMobile from "@repo/util/hooks/useIsMobile"; + +interface ButtonProps { + backgroundColor: string; + textColor: string; + text: string; + borderColor?: string; + hoverBGColor?: string; + hoverText?: string; +} + +const FilterButton: React.FC = ({ + backgroundColor, + textColor, + text, + borderColor, + hoverBGColor, + hoverText, +}) => { + const [isHovered, setIsHovered] = useState(false); + + const isMobile = useIsMobile(); + + const baseStyle: React.CSSProperties = { + backgroundColor: backgroundColor, + color: textColor, + borderWidth: 1, + borderStyle: 'solid', + borderColor, + cursor: 'pointer', + transition: 'background-color 0.2s ease, color 0.2s ease', + }; + + const hoverStyle: React.CSSProperties = { + ...(hoverBGColor ? { backgroundColor: hoverBGColor } : {}), + ...(hoverText ? { color: hoverText } : {}), + ...(hoverBGColor ? { borderColor: hoverBGColor } : {}), + }; + + const finalStyle = { + ...baseStyle, + ...(isHovered && !isMobile ? hoverStyle : {}), + }; + + return ( + + ); +}; + +export default FilterButton; \ No newline at end of file diff --git a/apps/main/src/app/(landing)/Sections/About.tsx b/apps/main/src/app/(landing)/Sections/About.tsx index f2fa0947..2c72d53a 100644 --- a/apps/main/src/app/(landing)/Sections/About.tsx +++ b/apps/main/src/app/(landing)/Sections/About.tsx @@ -3,26 +3,26 @@ import React from "react"; import TextBackground from "../../lib/Assets/AboutLandingAssets/text"; import TeamPicture from "../../lib/Assets/AboutLandingAssets/teamPicture"; -// import PurpleBear from "../../lib/Assets/AboutLandingAssets/purpleBear"; -// import YellowBear from "../../lib/Assets/AboutLandingAssets/yellowBear"; +import PurpleBear from "../../lib/Assets/AboutLandingAssets/purpleBear"; +import YellowBear from "../../lib/Assets/AboutLandingAssets/yellowBear"; import RibbonTitle from "@repo/ui/RibbonTitle"; -// import Dart from "../../lib/Assets/AboutLandingAssets/dart"; +import Dart from "../../lib/Assets/AboutLandingAssets/dart"; import useDevice from "@util/hooks/useDevice"; export default function About(): React.ReactNode { const { isMobile } = useDevice(); return ( -
+
- {/*
+ {
-
*/} +
}
-
+

We're a non-profit organization in the Boston area that organizes an annual undergraduate hackathon. Our goal is to expand @@ -39,12 +39,14 @@ export default function About(): React.ReactNode {

- {/*
+
-
+ +
-
*/} +
+
); }